diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-08-17 23:19:01 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-11-20 01:17:26 +0000 |
| commit | 4487760ca25e7c0cc9dc68dab6f9d33f579c46d1 (patch) | |
| tree | b8a34ec08bb5f61103d088abb37629f50b4289d6 /include | |
| parent | 05809c99c0393ba58fd3596a9fab592c5e2dd750 (diff) | |
| download | linux-stable-4487760ca25e7c0cc9dc68dab6f9d33f579c46d1.tar.gz linux-stable-4487760ca25e7c0cc9dc68dab6f9d33f579c46d1.tar.bz2 linux-stable-4487760ca25e7c0cc9dc68dab6f9d33f579c46d1.zip | |
asm-generic: make get_user() clear the destination on errors
commit 9ad18b75c2f6e4a78ce204e79f37781f8815c0fa upstream.
both for access_ok() failures and for faults halfway through
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/uaccess.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h index e8e50f69e3c6..ae88865a3d67 100644 --- a/include/asm-generic/uaccess.h +++ b/include/asm-generic/uaccess.h @@ -228,14 +228,18 @@ extern int __put_user_bad(void) __attribute__((noreturn)); might_fault(); \ access_ok(VERIFY_READ, ptr, sizeof(*ptr)) ? \ __get_user(x, ptr) : \ - -EFAULT; \ + ((x) = (__typeof__(*(ptr)))0,-EFAULT); \ }) #ifndef __get_user_fn static inline int __get_user_fn(size_t size, const void __user *ptr, void *x) { - size = __copy_from_user(x, ptr, size); - return size ? -EFAULT : size; + size_t n = __copy_from_user(x, ptr, 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) |