lkml.org 
[lkml]   [2013]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v3 01/11] 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>
    ---
    include/asm-generic/uaccess.h | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
    index c184aa8..dc1269c 100644
    --- a/include/asm-generic/uaccess.h
    +++ b/include/asm-generic/uaccess.h
    @@ -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;

    --
    MST

    \
     
     \ /
      Last update: 2013-05-24 17:01    [W:4.239 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site