Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 16df845f authored Jul 26, 2008 by Florian Westphal Committed by David S. Miller Jul 26, 2008

syncookies: Make sure ECN is disabled



ecn_ok is not initialized when a connection is established by cookies.
The cookie syn-ack never sets ECN, so ecn_ok must be set to 0.

Spotted using ns-3/network simulation cradle simulator and valgrind.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ec34c702

net/ipv4/syncookies.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -299,6 +299,7 @@ struct sock cookie_v4_check(struct sock sk, struct sk_buff *skb,
	ireq->rmt_port = th->source;		ireq->rmt_port = th->source;
	ireq->loc_addr = ip_hdr(skb)->daddr;		ireq->loc_addr = ip_hdr(skb)->daddr;
	ireq->rmt_addr = ip_hdr(skb)->saddr;		ireq->rmt_addr = ip_hdr(skb)->saddr;
			ireq->ecn_ok = 0;
	ireq->snd_wscale = tcp_opt.snd_wscale;		ireq->snd_wscale = tcp_opt.snd_wscale;
	ireq->rcv_wscale = tcp_opt.rcv_wscale;		ireq->rcv_wscale = tcp_opt.rcv_wscale;
	ireq->sack_ok = tcp_opt.sack_ok;		ireq->sack_ok = tcp_opt.sack_ok;

net/ipv6/syncookies.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -223,6 +223,7 @@ struct sock cookie_v6_check(struct sock sk, struct sk_buff *skb)

	req->expires = 0UL;		req->expires = 0UL;
	req->retrans = 0;		req->retrans = 0;
			ireq->ecn_ok = 0;
	ireq->snd_wscale = tcp_opt.snd_wscale;		ireq->snd_wscale = tcp_opt.snd_wscale;
	ireq->rcv_wscale = tcp_opt.rcv_wscale;		ireq->rcv_wscale = tcp_opt.rcv_wscale;
	ireq->sack_ok = tcp_opt.sack_ok;		ireq->sack_ok = tcp_opt.sack_ok;