diff options
| author | Florian Westphal <fw@strlen.de> | 2010-06-16 14:42:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-16 14:42:15 -0700 |
| commit | 8c76368174ed2359739f1b7b8a9c042b1ef839c4 (patch) | |
| tree | 143aa28c9438b24154bc3d1e36b432a534eca50c /include | |
| parent | 317fe0e6c5dc9448bcef41a2e31fecfd3dba7f55 (diff) | |
| download | kernel_samsung_aries-8c76368174ed2359739f1b7b8a9c042b1ef839c4.zip kernel_samsung_aries-8c76368174ed2359739f1b7b8a9c042b1ef839c4.tar.gz kernel_samsung_aries-8c76368174ed2359739f1b7b8a9c042b1ef839c4.tar.bz2 | |
syncookies: check decoded options against sysctl settings
Discard the ACK if we find options that do not match current sysctl
settings.
Previously it was possible to create a connection with sack, wscale,
etc. enabled even if the feature was disabled via sysctl.
Also remove an unneeded call to tcp_sack_reset() in
cookie_check_timestamp: Both call sites (cookie_v4_check,
cookie_v6_check) zero "struct tcp_options_received", hand it to
tcp_parse_options() (which does not change tcp_opt->num_sacks/dsack)
and then call cookie_check_timestamp().
Even if num_sacks/dsacks were changed, the structure is allocated on
the stack and after cookie_check_timestamp returns only a few selected
members are copied to the inet_request_sock.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 9e68e25..18c246c 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -464,7 +464,7 @@ extern __u32 cookie_v4_init_sequence(struct sock *sk, struct sk_buff *skb, __u16 *mss); extern __u32 cookie_init_timestamp(struct request_sock *req); -extern void cookie_check_timestamp(struct tcp_options_received *tcp_opt); +extern bool cookie_check_timestamp(struct tcp_options_received *tcp_opt); /* From net/ipv6/syncookies.c */ extern struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb); |