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.7 177/184] nios2: copy_from_user() should zero the tail of destination
    Date
    4.7-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit e33d1f6f72cc82fcfc3d1fb20c9e3ad83b1928fa upstream.

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

    ---
    arch/nios2/include/asm/uaccess.h | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- a/arch/nios2/include/asm/uaccess.h
    +++ b/arch/nios2/include/asm/uaccess.h
    @@ -102,9 +102,12 @@ extern long __copy_to_user(void __user *
    static inline long copy_from_user(void *to, const void __user *from,
    unsigned long n)
    {
    - if (!access_ok(VERIFY_READ, from, n))
    - return n;
    - return __copy_from_user(to, from, n);
    + unsigned long res = n;
    + if (access_ok(VERIFY_READ, from, n))
    + res = __copy_from_user(to, from, n);
    + if (unlikely(res))
    + memset(to + (n - res), 0, res);
    + return res;
    }

    static inline long copy_to_user(void __user *to, const void *from,

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