Commit 83ae1b79 authored May 08, 2007 by Andreas Schwab Committed by Linus Torvalds May 08, 2007

Fix error handling in HDIO_GETGEO compat wrapper



Don't clobber error from sys_ioctl in HDIO_GETGEO compat wrapper.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent a3e09756

fs/compat_ioctl.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -684,8 +684,10 @@ static int hdio_getgeo(unsigned int fd, unsigned int cmd, unsigned long arg)
		if (!err) {
		err = copy_to_user (ugeo, &geo, 4);
		err \|= __put_user (geo.start, &ugeo->start);
		if (err)
		err = -EFAULT;
		}
		return err ? -EFAULT : 0;
		return err;
		}

		static int hdio_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg)