diff options
| author | Xi Wang <xi.wang@gmail.com> | 2011-12-16 07:44:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-19 16:25:46 -0500 |
| commit | 2692ba61a82203404abd7dd2a027bda962861f74 (patch) | |
| tree | e39f21131faf42ada263c1969cfa200af2f4b0f9 /net/sctp/sysctl.c | |
| parent | 2ca6cf06d988fea21e812a86be79353352677c9c (diff) | |
sctp: fix incorrect overflow check on autoclose
Commit 8ffd3208 voids the previous patches f6778aab and 810c0719 for
limiting the autoclose value. If userspace passes in -1 on 32-bit
platform, the overflow check didn't work and autoclose would be set
to 0xffffffff.
This patch defines a max_autoclose (in seconds) for limiting the value
and exposes it through sysctl, with the following intentions.
1) Avoid overflowing autoclose * HZ.
2) Keep the default autoclose bound consistent across 32- and 64-bit
platforms (INT_MAX / HZ in this patch).
3) Keep the autoclose value consistent between setsockopt() and
getsockopt() calls.
Suggested-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sysctl.c')
| -rw-r--r-- | net/sctp/sysctl.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c index 6b3952961b85..60ffbd067ff7 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c | |||
| @@ -53,6 +53,10 @@ static int sack_timer_min = 1; | |||
| 53 | static int sack_timer_max = 500; | 53 | static int sack_timer_max = 500; |
| 54 | static int addr_scope_max = 3; /* check sctp_scope_policy_t in include/net/sctp/constants.h for max entries */ | 54 | static int addr_scope_max = 3; /* check sctp_scope_policy_t in include/net/sctp/constants.h for max entries */ |
| 55 | static int rwnd_scale_max = 16; | 55 | static int rwnd_scale_max = 16; |
| 56 | static unsigned long max_autoclose_min = 0; | ||
| 57 | static unsigned long max_autoclose_max = | ||
| 58 | (MAX_SCHEDULE_TIMEOUT / HZ > UINT_MAX) | ||
| 59 | ? UINT_MAX : MAX_SCHEDULE_TIMEOUT / HZ; | ||
| 56 | 60 | ||
| 57 | extern long sysctl_sctp_mem[3]; | 61 | extern long sysctl_sctp_mem[3]; |
| 58 | extern int sysctl_sctp_rmem[3]; | 62 | extern int sysctl_sctp_rmem[3]; |
| @@ -258,6 +262,15 @@ static ctl_table sctp_table[] = { | |||
| 258 | .extra1 = &one, | 262 | .extra1 = &one, |
| 259 | .extra2 = &rwnd_scale_max, | 263 | .extra2 = &rwnd_scale_max, |
| 260 | }, | 264 | }, |
| 265 | { | ||
| 266 | .procname = "max_autoclose", | ||
| 267 | .data = &sctp_max_autoclose, | ||
| 268 | .maxlen = sizeof(unsigned long), | ||
| 269 | .mode = 0644, | ||
| 270 | .proc_handler = &proc_doulongvec_minmax, | ||
| 271 | .extra1 = &max_autoclose_min, | ||
| 272 | .extra2 = &max_autoclose_max, | ||
| 273 | }, | ||
| 261 | 274 | ||
| 262 | { /* sentinel */ } | 275 | { /* sentinel */ } |
| 263 | }; | 276 | }; |