compat: return -EFAULT on error in waitid()

Dan Carpenter · torvalds · commit bffea77c08c3 · 2013-02-21T17:22:16.000-08:00
The copy_to_user() call returns the number of bytes remaining but we
want to return -EFAULT on error.

Fixes "x32: fix waitid()"

Signed-off-by: Dan Carpenter &lt;dan.carpenter@oracle.com&gt;
Cc: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/kernel/compat.c b/kernel/compat.c
@@ -593,7 +593,7 @@ COMPAT_SYSCALL_DEFINE5(waitid,
 		else
 			ret = put_compat_rusage(&ru, uru);
 		if (ret)
-			return ret;
+			return -EFAULT;
 	}
 
 	BUG_ON(info.si_code & __SI_MASK);

Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,7 @@ COMPAT_SYSCALL_DEFINE5(waitid,`
`593`	`593`	`else`
`594`	`594`	`ret = put_compat_rusage(&ru, uru);`
`595`	`595`	`if (ret)`
`596`		`- return ret;`
	`596`	`+ return -EFAULT;`
`597`	`597`	`}`
`598`	`598`
`599`	`599`	`BUG_ON(info.si_code & __SI_MASK);`