lkml.org 
[lkml]   [2020]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 331/391] net/sunrpc: Fix return value for sysctl sunrpc.transports
    Date
    From: Artur Molchanov <arturmolchanov@gmail.com>

    commit c09f56b8f68d4d536bff518227aea323b835b2ce upstream.

    Fix returning value for sysctl sunrpc.transports.
    Return error code from sysctl proc_handler function proc_do_xprt instead of number of the written bytes.
    Otherwise sysctl returns random garbage for this key.

    Since v1:
    - Handle negative returned value from memory_read_from_buffer as an error

    Signed-off-by: Artur Molchanov <arturmolchanov@gmail.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/sunrpc/sysctl.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    --- a/net/sunrpc/sysctl.c
    +++ b/net/sunrpc/sysctl.c
    @@ -70,7 +70,13 @@ static int proc_do_xprt(struct ctl_table
    return 0;
    }
    len = svc_print_xprts(tmpbuf, sizeof(tmpbuf));
    - return memory_read_from_buffer(buffer, *lenp, ppos, tmpbuf, len);
    + *lenp = memory_read_from_buffer(buffer, *lenp, ppos, tmpbuf, len);
    +
    + if (*lenp < 0) {
    + *lenp = 0;
    + return -EINVAL;
    + }
    + return 0;
    }

    static int

    \
     
     \ /
      Last update: 2020-11-03 22:48    [W:2.552 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site