mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 19:30:30 +09:00
asm-generic: make get_user() clear the destination on errors
commit 9ad18b75c2 upstream.
both for access_ok() failures and for faults halfway through
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
59a2d6b2a6
commit
c6a4404dc2
@@ -230,14 +230,18 @@ extern int __put_user_bad(void) __attribute__((noreturn));
|
||||
might_fault(); \
|
||||
access_ok(VERIFY_READ, __p, sizeof(*ptr)) ? \
|
||||
__get_user((x), (__typeof__(*(ptr)) *)__p) : \
|
||||
-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)
|
||||
|
||||
Reference in New Issue
Block a user