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
(parent:
f69350b
)
microblaze: fix copy_from_user()
author
Al Viro
<viro@zeniv.linux.org.uk>
Fri, 9 Sep 2016 23:22:34 +0000
(19:22 -0400)
committer
Ben Hutchings
<ben@decadent.org.uk>
Sun, 20 Nov 2016 01:01:40 +0000
(
01:01
+0000)
commit
d0cf385160c12abd109746cad1f13e3b3e8b50b8
upstream.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/microblaze/include/asm/uaccess.h
patch
|
blob
|
history
diff --git
a/arch/microblaze/include/asm/uaccess.h
b/arch/microblaze/include/asm/uaccess.h
index
072b007
..
36ea6fe
100644
(file)
--- a/
arch/microblaze/include/asm/uaccess.h
+++ b/
arch/microblaze/include/asm/uaccess.h
@@
-364,10
+364,13
@@
extern long __user_bad(void);
static inline long copy_from_user(void *to,
const void __user *from, unsigned long n)
{
+ unsigned long res = n;
might_sleep();
- if (access_ok(VERIFY_READ, from, n))
- return __copy_from_user(to, from, n);
- return n;
+ if (likely(access_ok(VERIFY_READ, from, n)))
+ res = __copy_from_user(to, from, n);
+ if (unlikely(res))
+ memset(to + (n - res), 0, res);
+ return res;
}
#define __copy_to_user(to, from, n) \