Commit b16b8403 authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman
Browse files

ncpfs: return proper error from NCP_IOC_SETROOT ioctl 



commit a682e9c2 upstream.

If some error happens in NCP_IOC_SETROOT ioctl, the appropriate error
return value is then (in most cases) just overwritten before we return.
This can result in reporting success to userspace although error happened.

This bug was introduced by commit 2e54eb96 ("BKL: Remove BKL from
ncpfs").  Propagate the errors correctly.

Coverity id: 1226925.

Fixes: 2e54eb96 ("BKL: Remove BKL from ncpfs")
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Cc: Petr Vandrovec <petr@vandrovec.name>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f62b3ed

fs/ncpfs/ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ static long __ncp_ioctl(struct inode *inode, unsigned int cmd, unsigned long arg 
						result = -EIO;

					}

				}

				result = 0;

			}

			mutex_unlock(&server->root_setup_lock);