diff options
author | Glenn Griffin <ggriffin.kernel@gmail.com> | 2008-02-08 00:49:26 -0500 |
---|---|---|
committer | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-03-04 01:18:21 -0500 |
commit | c6aefafb7ec620911d46174eed514f9df639e5a4 (patch) | |
tree | 626e3d47a7bb31f586935c480bed09f342f2fbca /net | |
parent | 11baab7ac34723ad481e0f97fca733272ef364d4 (diff) |
[TCP]: Add IPv6 support to TCP SYN cookies
Updated to incorporate Eric's suggestion of using a per cpu buffer
rather than allocating on the stack. Just a two line change, but will
resend in it's entirety.
Signed-off-by: Glenn Griffin <ggriffin.kernel@gmail.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/syncookies.c | 7 | ||||
-rw-r--r-- | net/ipv4/tcp_input.c | 1 | ||||
-rw-r--r-- | net/ipv4/tcp_minisocks.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_output.c | 1 | ||||
-rw-r--r-- | net/ipv6/Makefile | 1 | ||||
-rw-r--r-- | net/ipv6/syncookies.c | 267 | ||||
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 77 |
7 files changed, 330 insertions, 26 deletions
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c index 177da14f6b14..4704f27f6c0b 100644 --- a/net/ipv4/syncookies.c +++ b/net/ipv4/syncookies.c | |||
@@ -10,8 +10,6 @@ | |||
10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
11 | * | 11 | * |
12 | * $Id: syncookies.c,v 1.18 2002/02/01 22:01:04 davem Exp $ | 12 | * $Id: syncookies.c,v 1.18 2002/02/01 22:01:04 davem Exp $ |
13 | * | ||
14 | * Missing: IPv6 support. | ||
15 | */ | 13 | */ |
16 | 14 | ||
17 | #include <linux/tcp.h> | 15 | #include <linux/tcp.h> |
@@ -23,14 +21,15 @@ | |||
23 | 21 | ||
24 | extern int sysctl_tcp_syncookies; | 22 | extern int sysctl_tcp_syncookies; |
25 | 23 | ||
26 | static __u32 syncookie_secret[2][16-3+SHA_DIGEST_WORDS]; | 24 | __u32 syncookie_secret[2][16-3+SHA_DIGEST_WORDS]; |
25 | EXPORT_SYMBOL(syncookie_secret); | ||
27 | 26 | ||
28 | static __init int init_syncookies(void) | 27 | static __init int init_syncookies(void) |
29 | { | 28 | { |
30 | get_random_bytes(syncookie_secret, sizeof(syncookie_secret)); | 29 | get_random_bytes(syncookie_secret, sizeof(syncookie_secret)); |
31 | return 0; | 30 | return 0; |
32 | } | 31 | } |
33 | module_init(init_syncookies); | 32 | __initcall(init_syncookies); |
34 | 33 | ||
35 | #define COOKIEBITS 24 /* Upper bits store count */ | 34 | #define COOKIEBITS 24 /* Upper bits store count */ |
36 | #define COOKIEMASK (((__u32)1 << COOKIEBITS) - 1) | 35 | #define COOKIEMASK (((__u32)1 << COOKIEBITS) - 1) |
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 19c449f62672..93e128c239c4 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -5326,6 +5326,7 @@ discard: | |||
5326 | 5326 | ||
5327 | EXPORT_SYMBOL(sysctl_tcp_ecn); | 5327 | EXPORT_SYMBOL(sysctl_tcp_ecn); |
5328 | EXPORT_SYMBOL(sysctl_tcp_reordering); | 5328 | EXPORT_SYMBOL(sysctl_tcp_reordering); |
5329 | EXPORT_SYMBOL(sysctl_tcp_adv_win_scale); | ||
5329 | EXPORT_SYMBOL(tcp_parse_options); | 5330 | EXPORT_SYMBOL(tcp_parse_options); |
5330 | EXPORT_SYMBOL(tcp_rcv_established); | 5331 | EXPORT_SYMBOL(tcp_rcv_established); |
5331 | EXPORT_SYMBOL(tcp_rcv_state_process); | 5332 | EXPORT_SYMBOL(tcp_rcv_state_process); |
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 0fdd1db641ac..8245247a6ceb 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c | |||
@@ -35,6 +35,8 @@ | |||
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | int sysctl_tcp_syncookies __read_mostly = SYNC_INIT; | 37 | int sysctl_tcp_syncookies __read_mostly = SYNC_INIT; |
38 | EXPORT_SYMBOL(sysctl_tcp_syncookies); | ||
39 | |||
38 | int sysctl_tcp_abort_on_overflow __read_mostly; | 40 | int sysctl_tcp_abort_on_overflow __read_mostly; |
39 | 41 | ||
40 | struct inet_timewait_death_row tcp_death_row = { | 42 | struct inet_timewait_death_row tcp_death_row = { |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index ed750f9ceb07..cbfef8b1f5e8 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -2560,6 +2560,7 @@ void tcp_send_probe0(struct sock *sk) | |||
2560 | } | 2560 | } |
2561 | } | 2561 | } |
2562 | 2562 | ||
2563 | EXPORT_SYMBOL(tcp_select_initial_window); | ||
2563 | EXPORT_SYMBOL(tcp_connect); | 2564 | EXPORT_SYMBOL(tcp_connect); |
2564 | EXPORT_SYMBOL(tcp_make_synack); | 2565 | EXPORT_SYMBOL(tcp_make_synack); |
2565 | EXPORT_SYMBOL(tcp_simple_retransmit); | 2566 | EXPORT_SYMBOL(tcp_simple_retransmit); |
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile index 24f3aa0f2a35..ae14617e607f 100644 --- a/net/ipv6/Makefile +++ b/net/ipv6/Makefile | |||
@@ -16,6 +16,7 @@ ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \ | |||
16 | ipv6-$(CONFIG_NETFILTER) += netfilter.o | 16 | ipv6-$(CONFIG_NETFILTER) += netfilter.o |
17 | ipv6-$(CONFIG_IPV6_MULTIPLE_TABLES) += fib6_rules.o | 17 | ipv6-$(CONFIG_IPV6_MULTIPLE_TABLES) += fib6_rules.o |
18 | ipv6-$(CONFIG_PROC_FS) += proc.o | 18 | ipv6-$(CONFIG_PROC_FS) += proc.o |
19 | ipv6-$(CONFIG_SYN_COOKIES) += syncookies.o | ||
19 | 20 | ||
20 | ipv6-objs += $(ipv6-y) | 21 | ipv6-objs += $(ipv6-y) |
21 | 22 | ||
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c new file mode 100644 index 000000000000..827c5aa7524c --- /dev/null +++ b/net/ipv6/syncookies.c | |||
@@ -0,0 +1,267 @@ | |||
1 | /* | ||
2 | * IPv6 Syncookies implementation for the Linux kernel | ||
3 | * | ||
4 | * Authors: | ||
5 | * Glenn Griffin <ggriffin.kernel@gmail.com> | ||
6 | * | ||
7 | * Based on IPv4 implementation by Andi Kleen | ||
8 | * linux/net/ipv4/syncookies.c | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or | ||
11 | * modify it under the terms of the GNU General Public License | ||
12 | * as published by the Free Software Foundation; either version | ||
13 | * 2 of the License, or (at your option) any later version. | ||
14 | * | ||
15 | */ | ||
16 | |||
17 | #include <linux/tcp.h> | ||
18 | #include <linux/random.h> | ||
19 | #include <linux/cryptohash.h> | ||
20 | #include <linux/kernel.h> | ||
21 | #include <net/ipv6.h> | ||
22 | #include <net/tcp.h> | ||
23 | |||
24 | extern int sysctl_tcp_syncookies; | ||
25 | extern __u32 syncookie_secret[2][16-3+SHA_DIGEST_WORDS]; | ||
26 | |||
27 | #define COOKIEBITS 24 /* Upper bits store count */ | ||
28 | #define COOKIEMASK (((__u32)1 << COOKIEBITS) - 1) | ||
29 | |||
30 | /* | ||
31 | * This table has to be sorted and terminated with (__u16)-1. | ||
32 | * XXX generate a better table. | ||
33 | * Unresolved Issues: HIPPI with a 64k MSS is not well supported. | ||
34 | * | ||
35 | * Taken directly from ipv4 implementation. | ||
36 | * Should this list be modified for ipv6 use or is it close enough? | ||
37 | * rfc 2460 8.3 suggests mss values 20 bytes less than ipv4 counterpart | ||
38 | */ | ||
39 | static __u16 const msstab[] = { | ||
40 | 64 - 1, | ||
41 | 256 - 1, | ||
42 | 512 - 1, | ||
43 | 536 - 1, | ||
44 | 1024 - 1, | ||
45 | 1440 - 1, | ||
46 | 1460 - 1, | ||
47 | 4312 - 1, | ||
48 | (__u16)-1 | ||
49 | }; | ||
50 | /* The number doesn't include the -1 terminator */ | ||
51 | #define NUM_MSS (ARRAY_SIZE(msstab) - 1) | ||
52 | |||
53 | /* | ||
54 | * This (misnamed) value is the age of syncookie which is permitted. | ||
55 | * Its ideal value should be dependent on TCP_TIMEOUT_INIT and | ||
56 | * sysctl_tcp_retries1. It's a rather complicated formula (exponential | ||
57 | * backoff) to compute at runtime so it's currently hardcoded here. | ||
58 | */ | ||
59 | #define COUNTER_TRIES 4 | ||
60 | |||
61 | static inline struct sock *get_cookie_sock(struct sock *sk, struct sk_buff *skb, | ||
62 | struct request_sock *req, | ||
63 | struct dst_entry *dst) | ||
64 | { | ||
65 | struct inet_connection_sock *icsk = inet_csk(sk); | ||
66 | struct sock *child; | ||
67 | |||
68 | child = icsk->icsk_af_ops->syn_recv_sock(sk, skb, req, dst); | ||
69 | if (child) | ||
70 | inet_csk_reqsk_queue_add(sk, req, child); | ||
71 | else | ||
72 | reqsk_free(req); | ||
73 | |||
74 | return child; | ||
75 | } | ||
76 | |||
77 | static DEFINE_PER_CPU(__u32, cookie_scratch)[16 + 5 + SHA_WORKSPACE_WORDS]; | ||
78 | |||
79 | static u32 cookie_hash(struct in6_addr *saddr, struct in6_addr *daddr, | ||
80 | __be16 sport, __be16 dport, u32 count, int c) | ||
81 | { | ||
82 | __u32 *tmp = __get_cpu_var(cookie_scratch); | ||
83 | |||
84 | /* | ||
85 | * we have 320 bits of information to hash, copy in the remaining | ||
86 | * 192 bits required for sha_transform, from the syncookie_secret | ||
87 | * and overwrite the digest with the secret | ||
88 | */ | ||
89 | memcpy(tmp + 10, syncookie_secret[c], 44); | ||
90 | memcpy(tmp, saddr, 16); | ||
91 | memcpy(tmp + 4, daddr, 16); | ||
92 | tmp[8] = ((__force u32)sport << 16) + (__force u32)dport; | ||
93 | tmp[9] = count; | ||
94 | sha_transform(tmp + 16, (__u8 *)tmp, tmp + 16 + 5); | ||
95 | |||
96 | return tmp[17]; | ||
97 | } | ||
98 | |||
99 | static __u32 secure_tcp_syn_cookie(struct in6_addr *saddr, struct in6_addr *daddr, | ||
100 | __be16 sport, __be16 dport, __u32 sseq, | ||
101 | __u32 count, __u32 data) | ||
102 | { | ||
103 | return (cookie_hash(saddr, daddr, sport, dport, 0, 0) + | ||
104 | sseq + (count << COOKIEBITS) + | ||
105 | ((cookie_hash(saddr, daddr, sport, dport, count, 1) + data) | ||
106 | & COOKIEMASK)); | ||
107 | } | ||
108 | |||
109 | static __u32 check_tcp_syn_cookie(__u32 cookie, struct in6_addr *saddr, | ||
110 | struct in6_addr *daddr, __be16 sport, | ||
111 | __be16 dport, __u32 sseq, __u32 count, | ||
112 | __u32 maxdiff) | ||
113 | { | ||
114 | __u32 diff; | ||
115 | |||
116 | cookie -= cookie_hash(saddr, daddr, sport, dport, 0, 0) + sseq; | ||
117 | |||
118 | diff = (count - (cookie >> COOKIEBITS)) & ((__u32) -1 >> COOKIEBITS); | ||
119 | if (diff >= maxdiff) | ||
120 | return (__u32)-1; | ||
121 | |||
122 | return (cookie - | ||
123 | cookie_hash(saddr, daddr, sport, dport, count - diff, 1)) | ||
124 | & COOKIEMASK; | ||
125 | } | ||
126 | |||
127 | __u32 cookie_v6_init_sequence(struct sock *sk, struct sk_buff *skb, __u16 *mssp) | ||
128 | { | ||
129 | struct ipv6hdr *iph = ipv6_hdr(skb); | ||
130 | const struct tcphdr *th = tcp_hdr(skb); | ||
131 | int mssind; | ||
132 | const __u16 mss = *mssp; | ||
133 | |||
134 | tcp_sk(sk)->last_synq_overflow = jiffies; | ||
135 | |||
136 | for (mssind = 0; mss > msstab[mssind + 1]; mssind++) | ||
137 | ; | ||
138 | *mssp = msstab[mssind] + 1; | ||
139 | |||
140 | NET_INC_STATS_BH(LINUX_MIB_SYNCOOKIESSENT); | ||
141 | |||
142 | return secure_tcp_syn_cookie(&iph->saddr, &iph->daddr, th->source, | ||
143 | th->dest, ntohl(th->seq), | ||
144 | jiffies / (HZ * 60), mssind); | ||
145 | } | ||
146 | |||
147 | static inline int cookie_check(struct sk_buff *skb, __u32 cookie) | ||
148 | { | ||
149 | struct ipv6hdr *iph = ipv6_hdr(skb); | ||
150 | const struct tcphdr *th = tcp_hdr(skb); | ||
151 | __u32 seq = ntohl(th->seq) - 1; | ||
152 | __u32 mssind = check_tcp_syn_cookie(cookie, &iph->saddr, &iph->daddr, | ||
153 | th->source, th->dest, seq, | ||
154 | jiffies / (HZ * 60), COUNTER_TRIES); | ||
155 | |||
156 | return mssind < NUM_MSS ? msstab[mssind] + 1 : 0; | ||
157 | } | ||
158 | |||
159 | struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) | ||
160 | { | ||
161 | struct inet_request_sock *ireq; | ||
162 | struct inet6_request_sock *ireq6; | ||
163 | struct tcp_request_sock *treq; | ||
164 | struct ipv6_pinfo *np = inet6_sk(sk); | ||
165 | struct tcp_sock *tp = tcp_sk(sk); | ||
166 | const struct tcphdr *th = tcp_hdr(skb); | ||
167 | __u32 cookie = ntohl(th->ack_seq) - 1; | ||
168 | struct sock *ret = sk; | ||
169 | struct request_sock *req; | ||
170 | int mss; | ||
171 | struct dst_entry *dst; | ||
172 | __u8 rcv_wscale; | ||
173 | |||
174 | if (!sysctl_tcp_syncookies || !th->ack) | ||
175 | goto out; | ||
176 | |||
177 | if (time_after(jiffies, tp->last_synq_overflow + TCP_TIMEOUT_INIT) || | ||
178 | (mss = cookie_check(skb, cookie)) == 0) { | ||
179 | NET_INC_STATS_BH(LINUX_MIB_SYNCOOKIESFAILED); | ||
180 | goto out; | ||
181 | } | ||
182 | |||
183 | NET_INC_STATS_BH(LINUX_MIB_SYNCOOKIESRECV); | ||
184 | |||
185 | ret = NULL; | ||
186 | req = inet6_reqsk_alloc(&tcp6_request_sock_ops); | ||
187 | if (!req) | ||
188 | goto out; | ||
189 | |||
190 | ireq = inet_rsk(req); | ||
191 | ireq6 = inet6_rsk(req); | ||
192 | treq = tcp_rsk(req); | ||
193 | ireq6->pktopts = NULL; | ||
194 | |||
195 | if (security_inet_conn_request(sk, skb, req)) { | ||
196 | reqsk_free(req); | ||
197 | goto out; | ||
198 | } | ||
199 | |||
200 | req->mss = mss; | ||
201 | ireq->rmt_port = th->source; | ||
202 | ipv6_addr_copy(&ireq6->rmt_addr, &ipv6_hdr(skb)->saddr); | ||
203 | ipv6_addr_copy(&ireq6->loc_addr, &ipv6_hdr(skb)->daddr); | ||
204 | if (ipv6_opt_accepted(sk, skb) || | ||
205 | np->rxopt.bits.rxinfo || np->rxopt.bits.rxoinfo || | ||
206 | np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim) { | ||
207 | atomic_inc(&skb->users); | ||
208 | ireq6->pktopts = skb; | ||
209 | } | ||
210 | |||
211 | ireq6->iif = sk->sk_bound_dev_if; | ||
212 | /* So that link locals have meaning */ | ||
213 | if (!sk->sk_bound_dev_if && | ||
214 | ipv6_addr_type(&ireq6->rmt_addr) & IPV6_ADDR_LINKLOCAL) | ||
215 | ireq6->iif = inet6_iif(skb); | ||
216 | |||
217 | req->expires = 0UL; | ||
218 | req->retrans = 0; | ||
219 | ireq->snd_wscale = ireq->rcv_wscale = ireq->tstamp_ok = 0; | ||
220 | ireq->wscale_ok = ireq->sack_ok = 0; | ||
221 | treq->rcv_isn = ntohl(th->seq) - 1; | ||
222 | treq->snt_isn = cookie; | ||
223 | |||
224 | /* | ||
225 | * We need to lookup the dst_entry to get the correct window size. | ||
226 | * This is taken from tcp_v6_syn_recv_sock. Somebody please enlighten | ||
227 | * me if there is a preferred way. | ||
228 | */ | ||
229 | { | ||
230 | struct in6_addr *final_p = NULL, final; | ||
231 | struct flowi fl; | ||
232 | memset(&fl, 0, sizeof(fl)); | ||
233 | fl.proto = IPPROTO_TCP; | ||
234 | ipv6_addr_copy(&fl.fl6_dst, &ireq6->rmt_addr); | ||
235 | if (np->opt && np->opt->srcrt) { | ||
236 | struct rt0_hdr *rt0 = (struct rt0_hdr *) np->opt->srcrt; | ||
237 | ipv6_addr_copy(&final, &fl.fl6_dst); | ||
238 | ipv6_addr_copy(&fl.fl6_dst, rt0->addr); | ||
239 | final_p = &final; | ||
240 | } | ||
241 | ipv6_addr_copy(&fl.fl6_src, &ireq6->loc_addr); | ||
242 | fl.oif = sk->sk_bound_dev_if; | ||
243 | fl.fl_ip_dport = inet_rsk(req)->rmt_port; | ||
244 | fl.fl_ip_sport = inet_sk(sk)->sport; | ||
245 | security_req_classify_flow(req, &fl); | ||
246 | if (ip6_dst_lookup(sk, &dst, &fl)) { | ||
247 | reqsk_free(req); | ||
248 | goto out; | ||
249 | } | ||
250 | if (final_p) | ||
251 | ipv6_addr_copy(&fl.fl6_dst, final_p); | ||
252 | if ((xfrm_lookup(&dst, &fl, sk, 0)) < 0) | ||
253 | goto out; | ||
254 | } | ||
255 | |||
256 | req->window_clamp = dst_metric(dst, RTAX_WINDOW); | ||
257 | tcp_select_initial_window(tcp_full_space(sk), req->mss, | ||
258 | &req->rcv_wnd, &req->window_clamp, | ||
259 | 0, &rcv_wscale); | ||
260 | |||
261 | ireq->rcv_wscale = rcv_wscale; | ||
262 | |||
263 | ret = get_cookie_sock(sk, skb, req, dst); | ||
264 | |||
265 | out: return ret; | ||
266 | } | ||
267 | |||
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 1cbbb87dbad2..fd773ac7531a 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -512,6 +512,20 @@ done: | |||
512 | return err; | 512 | return err; |
513 | } | 513 | } |
514 | 514 | ||
515 | static inline void syn_flood_warning(struct sk_buff *skb) | ||
516 | { | ||
517 | #ifdef CONFIG_SYN_COOKIES | ||
518 | if (sysctl_tcp_syncookies) | ||
519 | printk(KERN_INFO | ||
520 | "TCPv6: Possible SYN flooding on port %d. " | ||
521 | "Sending cookies.\n", ntohs(tcp_hdr(skb)->dest)); | ||
522 | else | ||
523 | #endif | ||
524 | printk(KERN_INFO | ||
525 | "TCPv6: Possible SYN flooding on port %d. " | ||
526 | "Dropping request.\n", ntohs(tcp_hdr(skb)->dest)); | ||
527 | } | ||
528 | |||
515 | static void tcp_v6_reqsk_destructor(struct request_sock *req) | 529 | static void tcp_v6_reqsk_destructor(struct request_sock *req) |
516 | { | 530 | { |
517 | if (inet6_rsk(req)->pktopts) | 531 | if (inet6_rsk(req)->pktopts) |
@@ -915,7 +929,7 @@ done_opts: | |||
915 | } | 929 | } |
916 | #endif | 930 | #endif |
917 | 931 | ||
918 | static struct request_sock_ops tcp6_request_sock_ops __read_mostly = { | 932 | struct request_sock_ops tcp6_request_sock_ops __read_mostly = { |
919 | .family = AF_INET6, | 933 | .family = AF_INET6, |
920 | .obj_size = sizeof(struct tcp6_request_sock), | 934 | .obj_size = sizeof(struct tcp6_request_sock), |
921 | .rtx_syn_ack = tcp_v6_send_synack, | 935 | .rtx_syn_ack = tcp_v6_send_synack, |
@@ -1213,9 +1227,9 @@ static struct sock *tcp_v6_hnd_req(struct sock *sk,struct sk_buff *skb) | |||
1213 | return NULL; | 1227 | return NULL; |
1214 | } | 1228 | } |
1215 | 1229 | ||
1216 | #if 0 /*def CONFIG_SYN_COOKIES*/ | 1230 | #ifdef CONFIG_SYN_COOKIES |
1217 | if (!th->rst && !th->syn && th->ack) | 1231 | if (!th->rst && !th->syn && th->ack) |
1218 | sk = cookie_v6_check(sk, skb, &(IPCB(skb)->opt)); | 1232 | sk = cookie_v6_check(sk, skb); |
1219 | #endif | 1233 | #endif |
1220 | return sk; | 1234 | return sk; |
1221 | } | 1235 | } |
@@ -1231,6 +1245,11 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb) | |||
1231 | struct tcp_sock *tp = tcp_sk(sk); | 1245 | struct tcp_sock *tp = tcp_sk(sk); |
1232 | struct request_sock *req = NULL; | 1246 | struct request_sock *req = NULL; |
1233 | __u32 isn = TCP_SKB_CB(skb)->when; | 1247 | __u32 isn = TCP_SKB_CB(skb)->when; |
1248 | #ifdef CONFIG_SYN_COOKIES | ||
1249 | int want_cookie = 0; | ||
1250 | #else | ||
1251 | #define want_cookie 0 | ||
1252 | #endif | ||
1234 | 1253 | ||
1235 | if (skb->protocol == htons(ETH_P_IP)) | 1254 | if (skb->protocol == htons(ETH_P_IP)) |
1236 | return tcp_v4_conn_request(sk, skb); | 1255 | return tcp_v4_conn_request(sk, skb); |
@@ -1238,12 +1257,14 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb) | |||
1238 | if (!ipv6_unicast_destination(skb)) | 1257 | if (!ipv6_unicast_destination(skb)) |
1239 | goto drop; | 1258 | goto drop; |
1240 | 1259 | ||
1241 | /* | ||
1242 | * There are no SYN attacks on IPv6, yet... | ||
1243 | */ | ||
1244 | if (inet_csk_reqsk_queue_is_full(sk) && !isn) { | 1260 | if (inet_csk_reqsk_queue_is_full(sk) && !isn) { |
1245 | if (net_ratelimit()) | 1261 | if (net_ratelimit()) |
1246 | printk(KERN_INFO "TCPv6: dropping request, synflood is possible\n"); | 1262 | syn_flood_warning(skb); |
1263 | #ifdef CONFIG_SYN_COOKIES | ||
1264 | if (sysctl_tcp_syncookies) | ||
1265 | want_cookie = 1; | ||
1266 | else | ||
1267 | #endif | ||
1247 | goto drop; | 1268 | goto drop; |
1248 | } | 1269 | } |
1249 | 1270 | ||
@@ -1264,29 +1285,39 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb) | |||
1264 | 1285 | ||
1265 | tcp_parse_options(skb, &tmp_opt, 0); | 1286 | tcp_parse_options(skb, &tmp_opt, 0); |
1266 | 1287 | ||
1288 | if (want_cookie) { | ||
1289 | tcp_clear_options(&tmp_opt); | ||
1290 | tmp_opt.saw_tstamp = 0; | ||
1291 | } | ||
1292 | |||
1267 | tmp_opt.tstamp_ok = tmp_opt.saw_tstamp; | 1293 | tmp_opt.tstamp_ok = tmp_opt.saw_tstamp; |
1268 | tcp_openreq_init(req, &tmp_opt, skb); | 1294 | tcp_openreq_init(req, &tmp_opt, skb); |
1269 | 1295 | ||
1270 | treq = inet6_rsk(req); | 1296 | treq = inet6_rsk(req); |
1271 | ipv6_addr_copy(&treq->rmt_addr, &ipv6_hdr(skb)->saddr); | 1297 | ipv6_addr_copy(&treq->rmt_addr, &ipv6_hdr(skb)->saddr); |
1272 | ipv6_addr_copy(&treq->loc_addr, &ipv6_hdr(skb)->daddr); | 1298 | ipv6_addr_copy(&treq->loc_addr, &ipv6_hdr(skb)->daddr); |
1273 | TCP_ECN_create_request(req, tcp_hdr(skb)); | ||
1274 | treq->pktopts = NULL; | 1299 | treq->pktopts = NULL; |
1275 | if (ipv6_opt_accepted(sk, skb) || | 1300 | if (!want_cookie) |
1276 | np->rxopt.bits.rxinfo || np->rxopt.bits.rxoinfo || | 1301 | TCP_ECN_create_request(req, tcp_hdr(skb)); |
1277 | np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim) { | 1302 | |
1278 | atomic_inc(&skb->users); | 1303 | if (want_cookie) { |
1279 | treq->pktopts = skb; | 1304 | isn = cookie_v6_init_sequence(sk, skb, &req->mss); |
1280 | } | 1305 | } else if (!isn) { |
1281 | treq->iif = sk->sk_bound_dev_if; | 1306 | if (ipv6_opt_accepted(sk, skb) || |
1307 | np->rxopt.bits.rxinfo || np->rxopt.bits.rxoinfo || | ||
1308 | np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim) { | ||
1309 | atomic_inc(&skb->users); | ||
1310 | treq->pktopts = skb; | ||
1311 | } | ||
1312 | treq->iif = sk->sk_bound_dev_if; | ||
1282 | 1313 | ||
1283 | /* So that link locals have meaning */ | 1314 | /* So that link locals have meaning */ |
1284 | if (!sk->sk_bound_dev_if && | 1315 | if (!sk->sk_bound_dev_if && |
1285 | ipv6_addr_type(&treq->rmt_addr) & IPV6_ADDR_LINKLOCAL) | 1316 | ipv6_addr_type(&treq->rmt_addr) & IPV6_ADDR_LINKLOCAL) |
1286 | treq->iif = inet6_iif(skb); | 1317 | treq->iif = inet6_iif(skb); |
1287 | 1318 | ||
1288 | if (isn == 0) | ||
1289 | isn = tcp_v6_init_sequence(skb); | 1319 | isn = tcp_v6_init_sequence(skb); |
1320 | } | ||
1290 | 1321 | ||
1291 | tcp_rsk(req)->snt_isn = isn; | 1322 | tcp_rsk(req)->snt_isn = isn; |
1292 | 1323 | ||
@@ -1295,8 +1326,10 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb) | |||
1295 | if (tcp_v6_send_synack(sk, req)) | 1326 | if (tcp_v6_send_synack(sk, req)) |
1296 | goto drop; | 1327 | goto drop; |
1297 | 1328 | ||
1298 | inet6_csk_reqsk_queue_hash_add(sk, req, TCP_TIMEOUT_INIT); | 1329 | if (!want_cookie) { |
1299 | return 0; | 1330 | inet6_csk_reqsk_queue_hash_add(sk, req, TCP_TIMEOUT_INIT); |
1331 | return 0; | ||
1332 | } | ||
1300 | 1333 | ||
1301 | drop: | 1334 | drop: |
1302 | if (req) | 1335 | if (req) |