summaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorJie Liu <liujie165@huawei.com>2019-04-16 13:10:09 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-27 14:50:39 +0100
commitf4e55515d1cf8c47519ef1b1ca7bb9dddbb7b6e1 (patch)
tree0269ce74211a3b784c9b58b78a22ea52be1bf636 /net/tipc
parentb6cb6f9f785e560c8a8b6837662698dbd70a489c (diff)
downloadlinux-stable-f4e55515d1cf8c47519ef1b1ca7bb9dddbb7b6e1.tar.gz
linux-stable-f4e55515d1cf8c47519ef1b1ca7bb9dddbb7b6e1.tar.bz2
linux-stable-f4e55515d1cf8c47519ef1b1ca7bb9dddbb7b6e1.zip
tipc: set sysctl_tipc_rmem and named_timeout right range
[ 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>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/sysctl.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/tipc/sysctl.c b/net/tipc/sysctl.c
index 1a779b1e8510..40f6d82083d7 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,
},
{}
};