Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0acd0bd authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Ingo Molnar
Browse files

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: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@kernel.org>
parent e4aa937e

include/asm-generic/uaccess.h

+5 −5
Original line number Diff line number Diff line
@@ -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;