lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 286/346] score: fix __get_user/get_user
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

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

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

    commit c2f18fa4cbb3ad92e033a24efa27583978ce9600 upstream.

    * should zero on any failure
    * __get_user() should use __copy_from_user(), not copy_from_user()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/score/include/asm/uaccess.h | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/arch/score/include/asm/uaccess.h
    +++ b/arch/score/include/asm/uaccess.h
    @@ -158,7 +158,7 @@ do { \
    __get_user_asm(val, "lw", ptr); \
    break; \
    case 8: \
    - if ((copy_from_user((void *)&val, ptr, 8)) == 0) \
    + if (__copy_from_user((void *)&val, ptr, 8) == 0) \
    __gu_err = 0; \
    else \
    __gu_err = -EFAULT; \
    @@ -183,6 +183,8 @@ do { \
    \
    if (likely(access_ok(VERIFY_READ, __gu_ptr, size))) \
    __get_user_common((x), size, __gu_ptr); \
    + else \
    + (x) = 0; \
    \
    __gu_err; \
    })
    @@ -196,6 +198,7 @@ do { \
    "2:\n" \
    ".section .fixup,\"ax\"\n" \
    "3:li %0, %4\n" \
    + "li %1, 0\n" \
    "j 2b\n" \
    ".previous\n" \
    ".section __ex_table,\"a\"\n" \
    \
     
     \ /
      Last update: 2016-11-14 03:41    [W:5.256 / U:1.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site