Commit 4487760c authored by Al Viro's avatar Al Viro Committed by Ben Hutchings

asm-generic: make get_user() clear the destination on errors

commit 9ad18b75 upstream.

both for access_ok() failures and for faults halfway through
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 05809c99
...@@ -228,14 +228,18 @@ extern int __put_user_bad(void) __attribute__((noreturn)); ...@@ -228,14 +228,18 @@ extern int __put_user_bad(void) __attribute__((noreturn));
might_fault(); \ might_fault(); \
access_ok(VERIFY_READ, ptr, sizeof(*ptr)) ? \ access_ok(VERIFY_READ, ptr, sizeof(*ptr)) ? \
__get_user(x, ptr) : \ __get_user(x, ptr) : \
-EFAULT; \ ((x) = (__typeof__(*(ptr)))0,-EFAULT); \
}) })
#ifndef __get_user_fn #ifndef __get_user_fn
static inline int __get_user_fn(size_t size, const void __user *ptr, void *x) static inline int __get_user_fn(size_t size, const void __user *ptr, void *x)
{ {
size = __copy_from_user(x, ptr, size); size_t n = __copy_from_user(x, ptr, size);
return size ? -EFAULT : size; if (unlikely(n)) {
memset(x + (size - n), 0, n);
return -EFAULT;
}
return 0;
} }
#define __get_user_fn(sz, u, k) __get_user_fn(sz, u, k) #define __get_user_fn(sz, u, k) __get_user_fn(sz, u, k)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment