git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
237ea27
)
mn10300: copy_from_user() should zero on access_ok() failure...
author
Al Viro
<viro@zeniv.linux.org.uk>
Sat, 20 Aug 2016 20:33:10 +0000
(16:33 -0400)
committer
Ben Hutchings
<ben@decadent.org.uk>
Sun, 20 Nov 2016 01:01:39 +0000
(
01:01
+0000)
commit
ae7cc577ec2a4a6151c9e928fd1f595d953ecef1
upstream.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.2: include <linux/string.h> to get declaration of memset()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/mn10300/lib/usercopy.c
patch
|
blob
|
history
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.
*/
-#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)
@@
-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);
+ else
+ memset(to, 0, n);
return n;
}