lkml.org 
[lkml]   [2020]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 077/183] tipc: set sysctl_tipc_rmem and named_timeout right range
    Date
    From: Jie Liu <liujie165@huawei.com>

    [ Upstream commit 4bcd4ec1017205644a2697bccbc3b5143f522f5f ]

    We find that sysctl_tipc_rmem and named_timeout do not have the right minimum
    setting. sysctl_tipc_rmem should be larger than zero, like sysctl_tcp_rmem.
    And named_timeout as a timeout setting should be not less than zero.

    Fixes: cc79dd1ba9c10 ("tipc: change socket buffer overflow control to respect sk_rcvbuf")
    Fixes: a5325ae5b8bff ("tipc: add name distributor resiliency queue")
    Signed-off-by: Jie Liu <liujie165@huawei.com>
    Reported-by: Qiang Ning <ningqiang1@huawei.com>
    Reviewed-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
    Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/tipc/sysctl.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/net/tipc/sysctl.c b/net/tipc/sysctl.c
    index 1a779b1e85100..40f6d82083d7b 100644
    --- a/net/tipc/sysctl.c
    +++ b/net/tipc/sysctl.c
    @@ -37,6 +37,8 @@

    #include <linux/sysctl.h>

    +static int zero;
    +static int one = 1;
    static struct ctl_table_header *tipc_ctl_hdr;

    static struct ctl_table tipc_table[] = {
    @@ -45,14 +47,16 @@ static struct ctl_table tipc_table[] = {
    .data = &sysctl_tipc_rmem,
    .maxlen = sizeof(sysctl_tipc_rmem),
    .mode = 0644,
    - .proc_handler = proc_dointvec,
    + .proc_handler = proc_dointvec_minmax,
    + .extra1 = &one,
    },
    {
    .procname = "named_timeout",
    .data = &sysctl_tipc_named_timeout,
    .maxlen = sizeof(sysctl_tipc_named_timeout),
    .mode = 0644,
    - .proc_handler = proc_dointvec,
    + .proc_handler = proc_dointvec_minmax,
    + .extra1 = &zero,
    },
    {}
    };
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-28 15:12    [W:4.074 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site