diff options
author | Jie Liu <liujie165@huawei.com> | 2019-04-16 01:10:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-04-17 00:32:02 -0400 |
commit | 4bcd4ec1017205644a2697bccbc3b5143f522f5f (patch) | |
tree | 153bbab83efb5b5391c7ab68f14fa3bc1dee49d7 /net/tipc | |
parent | f7a937801b9f8788519a23b12cb4d6c2c84d84be (diff) |
tipc: set sysctl_tipc_rmem and named_timeout right range
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>
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/sysctl.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/tipc/sysctl.c b/net/tipc/sysctl.c index 3481e4906bd6..9df82a573aa7 100644 --- a/net/tipc/sysctl.c +++ b/net/tipc/sysctl.c | |||
@@ -38,6 +38,8 @@ | |||
38 | 38 | ||
39 | #include <linux/sysctl.h> | 39 | #include <linux/sysctl.h> |
40 | 40 | ||
41 | static int zero; | ||
42 | static int one = 1; | ||
41 | static struct ctl_table_header *tipc_ctl_hdr; | 43 | static struct ctl_table_header *tipc_ctl_hdr; |
42 | 44 | ||
43 | static struct ctl_table tipc_table[] = { | 45 | static struct ctl_table tipc_table[] = { |
@@ -46,14 +48,16 @@ static struct ctl_table tipc_table[] = { | |||
46 | .data = &sysctl_tipc_rmem, | 48 | .data = &sysctl_tipc_rmem, |
47 | .maxlen = sizeof(sysctl_tipc_rmem), | 49 | .maxlen = sizeof(sysctl_tipc_rmem), |
48 | .mode = 0644, | 50 | .mode = 0644, |
49 | .proc_handler = proc_dointvec, | 51 | .proc_handler = proc_dointvec_minmax, |
52 | .extra1 = &one, | ||
50 | }, | 53 | }, |
51 | { | 54 | { |
52 | .procname = "named_timeout", | 55 | .procname = "named_timeout", |
53 | .data = &sysctl_tipc_named_timeout, | 56 | .data = &sysctl_tipc_named_timeout, |
54 | .maxlen = sizeof(sysctl_tipc_named_timeout), | 57 | .maxlen = sizeof(sysctl_tipc_named_timeout), |
55 | .mode = 0644, | 58 | .mode = 0644, |
56 | .proc_handler = proc_dointvec, | 59 | .proc_handler = proc_dointvec_minmax, |
60 | .extra1 = &zero, | ||
57 | }, | 61 | }, |
58 | { | 62 | { |
59 | .procname = "sk_filter", | 63 | .procname = "sk_filter", |