git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mn10300: copy_from_user() should zero on access_ok() failure...
[pandora-kernel.git]
/
arch
/
mn10300
/
lib
/
usercopy.c
diff --git
a/arch/mn10300/lib/usercopy.c
b/arch/mn10300/lib/usercopy.c
index
7826e6c
..
a29c5dc
100644
(file)
--- a/
arch/mn10300/lib/usercopy.c
+++ b/
arch/mn10300/lib/usercopy.c
@@
-9,7
+9,8
@@
* as published by the Free Software Foundation; either version
* 2 of the Licence, or (at your option) any later version.
*/
* as published by the Free Software Foundation; either version
* 2 of the Licence, or (at your option) any later version.
*/
-#include <asm/uaccess.h>
+#include <linux/string.h>
+#include <linux/uaccess.h>
unsigned long
__generic_copy_to_user(void *to, const void *from, unsigned long n)
unsigned long
__generic_copy_to_user(void *to, const void *from, unsigned long n)
@@
-24,6
+25,8
@@
__generic_copy_from_user(void *to, const void *from, unsigned long n)
{
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to, from, n);
{
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to, from, n);
+ else
+ memset(to, 0, n);
return n;
}
return n;
}