hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

asm-generic: uaccess s/might_sleep/might_fault/ 

The only reason uaccess routines might sleep
is if they fault. Make this explicit.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1369577426-26721-1-git-send-email-mst@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Michael S. Tsirkin 2013-05-26 17:30:36 +03:00 committed by Ingo Molnar
parent e4aa937ec7
commit e0acd0bd05
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/asm-generic/uaccess.h
View File

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