lkml.org 
[lkml]   [2016]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 107/119] hexagon: fix strncpy_from_user() error return
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit f35c1e0671728d1c9abc405d05ef548b5fcb2fc4 upstream.

    It's -EFAULT, not -1 (and contrary to the comment in there,
    __strnlen_user() can return 0 - on faults).

    Acked-by: Richard Kuo <rkuo@codeaurora.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    arch/hexagon/include/asm/uaccess.h | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/arch/hexagon/include/asm/uaccess.h b/arch/hexagon/include/asm/uaccess.h
    index e4127e4d6a5b..25fc9049db8a 100644
    --- a/arch/hexagon/include/asm/uaccess.h
    +++ b/arch/hexagon/include/asm/uaccess.h
    @@ -102,7 +102,8 @@ static inline long hexagon_strncpy_from_user(char *dst, const char __user *src,
    {
    long res = __strnlen_user(src, n);

    - /* return from strnlen can't be zero -- that would be rubbish. */
    + if (unlikely(!res))
    + return -EFAULT;

    if (res > n) {
    copy_from_user(dst, src, n);
    --
    2.10.0
    \
     
     \ /
      Last update: 2016-09-29 12:33    [W:4.242 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site