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 175/184] parisc: fix copy_from_user()
    Date
    4.7-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit aace880feea38875fbc919761b77e5732a3659ef upstream.

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

    ---
    arch/parisc/include/asm/uaccess.h | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/arch/parisc/include/asm/uaccess.h
    +++ b/arch/parisc/include/asm/uaccess.h
    @@ -10,6 +10,7 @@
    #include <asm-generic/uaccess-unaligned.h>

    #include <linux/bug.h>
    +#include <linux/string.h>

    #define VERIFY_READ 0
    #define VERIFY_WRITE 1
    @@ -221,13 +222,14 @@ static inline unsigned long __must_check
    unsigned long n)
    {
    int sz = __compiletime_object_size(to);
    - int ret = -EFAULT;
    + unsigned long ret = n;

    if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
    ret = __copy_from_user(to, from, n);
    else
    copy_from_user_overflow();
    -
    + if (unlikely(ret))
    + memset(to + (n - ret), 0, ret);
    return ret;
    }


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