lkml.org 
[lkml]   [2017]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 085/319] blackfin: fix copy_from_user()
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    commit 8f035983dd826d7e04f67b28acf8e2f08c347e41 upstream.

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    arch/blackfin/include/asm/uaccess.h | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/arch/blackfin/include/asm/uaccess.h b/arch/blackfin/include/asm/uaccess.h
    index 57701c3..a992a78 100644
    --- a/arch/blackfin/include/asm/uaccess.h
    +++ b/arch/blackfin/include/asm/uaccess.h
    @@ -177,11 +177,12 @@ static inline int bad_user_access_length(void)
    static inline unsigned long __must_check
    copy_from_user(void *to, const void __user *from, unsigned long n)
    {
    - if (access_ok(VERIFY_READ, from, n))
    + if (likely(access_ok(VERIFY_READ, from, n))) {
    memcpy(to, (const void __force *)from, n);
    - else
    - return n;
    - return 0;
    + return 0;
    + }
    + memset(to, 0, n);
    + return n;
    }

    static inline unsigned long __must_check
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-02-05 21:19    [W:5.484 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site