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
microblaze: fix __get_user()
[pandora-kernel.git]
/
arch
/
microblaze
/
include
/
asm
/
uaccess.h
diff --git
a/arch/microblaze/include/asm/uaccess.h
b/arch/microblaze/include/asm/uaccess.h
index
072b007
..
7a5b1ee
100644
(file)
--- a/
arch/microblaze/include/asm/uaccess.h
+++ b/
arch/microblaze/include/asm/uaccess.h
@@
-218,7
+218,7
@@
extern long __user_bad(void);
#define __get_user(x, ptr) \
({ \
#define __get_user(x, ptr) \
({ \
- unsigned long __gu_val
;
\
+ unsigned long __gu_val
= 0;
\
/*unsigned long __gu_ptr = (unsigned long)(ptr);*/ \
long __gu_err; \
switch (sizeof(*(ptr))) { \
/*unsigned long __gu_ptr = (unsigned long)(ptr);*/ \
long __gu_err; \
switch (sizeof(*(ptr))) { \
@@
-364,10
+364,13
@@
extern long __user_bad(void);
static inline long copy_from_user(void *to,
const void __user *from, unsigned long n)
{
static inline long copy_from_user(void *to,
const void __user *from, unsigned long n)
{
+ unsigned long res = n;
might_sleep();
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) \
}
#define __copy_to_user(to, from, n) \