|
@@ -230,14 +230,18 @@ extern int __put_user_bad(void) __attribute__((noreturn));
|
|
might_fault(); \
|
|
might_fault(); \
|
|
access_ok(VERIFY_READ, __p, sizeof(*ptr)) ? \
|
|
access_ok(VERIFY_READ, __p, sizeof(*ptr)) ? \
|
|
__get_user((x), (__typeof__(*(ptr)) *)__p) : \
|
|
__get_user((x), (__typeof__(*(ptr)) *)__p) : \
|
|
- -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);
|
|
|
|
- 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)
|
|
#define __get_user_fn(sz, u, k) __get_user_fn(sz, u, k)
|