Browse Source

mn10300: copy_from_user() should zero on access_ok() failure...

Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 9 years ago
parent
commit
ae7cc577ec
1 changed files with 3 additions and 1 deletions
  1. 3 1
      arch/mn10300/lib/usercopy.c

+ 3 - 1
arch/mn10300/lib/usercopy.c

@@ -9,7 +9,7 @@
  * as published by the Free Software Foundation; either version
  * as published by the Free Software Foundation; either version
  * 2 of the Licence, or (at your option) any later version.
  * 2 of the Licence, or (at your option) any later version.
  */
  */
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 
 unsigned long
 unsigned long
 __generic_copy_to_user(void *to, const void *from, unsigned long n)
 __generic_copy_to_user(void *to, const void *from, unsigned long n)
@@ -24,6 +24,8 @@ __generic_copy_from_user(void *to, const void *from, unsigned long n)
 {
 {
 	if (access_ok(VERIFY_READ, from, n))
 	if (access_ok(VERIFY_READ, from, n))
 		__copy_user_zeroing(to, from, n);
 		__copy_user_zeroing(to, from, n);
+	else
+		memset(to, 0, n);
 	return n;
 	return n;
 }
 }