|
@@ -163,7 +163,7 @@ static inline __must_check long __copy_to_user(void __user *to,
|
|
|
|
|
|
#define put_user(x, ptr) \
|
|
|
({ \
|
|
|
- might_sleep(); \
|
|
|
+ might_fault(); \
|
|
|
access_ok(VERIFY_WRITE, ptr, sizeof(*ptr)) ? \
|
|
|
__put_user(x, ptr) : \
|
|
|
-EFAULT; \
|
|
@@ -225,7 +225,7 @@ extern int __put_user_bad(void) __attribute__((noreturn));
|
|
|
|
|
|
#define get_user(x, ptr) \
|
|
|
({ \
|
|
|
- might_sleep(); \
|
|
|
+ might_fault(); \
|
|
|
access_ok(VERIFY_READ, ptr, sizeof(*ptr)) ? \
|
|
|
__get_user(x, ptr) : \
|
|
|
-EFAULT; \
|
|
@@ -255,7 +255,7 @@ extern int __get_user_bad(void) __attribute__((noreturn));
|
|
|
static inline long copy_from_user(void *to,
|
|
|
const void __user * from, unsigned long n)
|
|
|
{
|
|
|
- might_sleep();
|
|
|
+ might_fault();
|
|
|
if (access_ok(VERIFY_READ, from, n))
|
|
|
return __copy_from_user(to, from, n);
|
|
|
else
|
|
@@ -265,7 +265,7 @@ static inline long copy_from_user(void *to,
|
|
|
static inline long copy_to_user(void __user *to,
|
|
|
const void *from, unsigned long n)
|
|
|
{
|
|
|
- might_sleep();
|
|
|
+ might_fault();
|
|
|
if (access_ok(VERIFY_WRITE, to, n))
|
|
|
return __copy_to_user(to, from, n);
|
|
|
else
|
|
@@ -336,7 +336,7 @@ __clear_user(void __user *to, unsigned long n)
|
|
|
static inline __must_check unsigned long
|
|
|
clear_user(void __user *to, unsigned long n)
|
|
|
{
|
|
|
- might_sleep();
|
|
|
+ might_fault();
|
|
|
if (!access_ok(VERIFY_WRITE, to, n))
|
|
|
return n;
|
|
|
|