lkml.org 
[lkml]   [2016]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 105/118] sh: fix copy_from_user()
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Al Viro <viro@zeniv.linux.org.uk>

    commit 6e050503a150b2126620c1a1e9b3a368fcd51eac upstream.

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/sh/include/asm/uaccess.h | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/arch/sh/include/asm/uaccess.h
    +++ b/arch/sh/include/asm/uaccess.h
    @@ -151,7 +151,10 @@ copy_from_user(void *to, const void __us
    __kernel_size_t __copy_size = (__kernel_size_t) n;

    if (__copy_size && __access_ok(__copy_from, __copy_size))
    - return __copy_user(to, from, __copy_size);
    + __copy_size = __copy_user(to, from, __copy_size);
    +
    + if (unlikely(__copy_size))
    + memset(to + (n - __copy_size), 0, __copy_size);

    return __copy_size;
    }

    \
     
     \ /
      Last update: 2016-09-23 00:04    [W:4.131 / U:0.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site