提交 ade03b71 编写于 作者: Z zhouxudong8 提交者: Xie XiuQi

tipc: set sysctl_tipc_rmem and named_timeout right range

mainline inclusion
from mainline-5.1-rc6
commit 4bcd4ec1017205644a2697bccbc3b5143f522f5f
category: bugfix
bugzilla: 14113
CVE: NA

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

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: cc79dd1b ("tipc: change socket buffer overflow control to respect sk_rcvbuf")
Fixes: a5325ae5 ("tipc: add name distributor resiliency queue")
Signed-off-by: NXudong Zhou <zhouxudong8@huawei.com>
Signed-off-by: NJie Liu <liujie165@huawei.com>
Reported-by: NQiang Ning <ningqiang1@huawei.com>
Reviewed-by: NZhiqiang Liu <liuzhiqiang26@huawei.com>
Reviewed-by: NMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 58adbaed
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#include <linux/sysctl.h> #include <linux/sysctl.h>
static int zero;
static int one = 1;
static struct ctl_table_header *tipc_ctl_hdr; static struct ctl_table_header *tipc_ctl_hdr;
static struct ctl_table tipc_table[] = { static struct ctl_table tipc_table[] = {
...@@ -45,14 +47,16 @@ static struct ctl_table tipc_table[] = { ...@@ -45,14 +47,16 @@ static struct ctl_table tipc_table[] = {
.data = &sysctl_tipc_rmem, .data = &sysctl_tipc_rmem,
.maxlen = sizeof(sysctl_tipc_rmem), .maxlen = sizeof(sysctl_tipc_rmem),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec_minmax,
.extra1 = &one,
}, },
{ {
.procname = "named_timeout", .procname = "named_timeout",
.data = &sysctl_tipc_named_timeout, .data = &sysctl_tipc_named_timeout,
.maxlen = sizeof(sysctl_tipc_named_timeout), .maxlen = sizeof(sysctl_tipc_named_timeout),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec_minmax,
.extra1 = &zero,
}, },
{} {}
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册