Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tcp: use correct req pointer in tcp_move_syn() calls

Browse source 
I mistakenly took wrong request sock pointer when calling tcp_move_syn()

@req_unhash is either a copy of @req, or a NULL value for
FastOpen connexions (as we do not expect to unhash the temporary
request sock from ehash table)

Fixes: 805c4bc057 ("tcp: fix req->saved_syn race")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Ying Cai <ycai@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2015-11-05 12:50:19 -08:00 • committed by David S. Miller
parent 30f7ea1c2b
commit 49a496c97d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/ipv4/tcp_ipv4.c
View file

@ -1327,7 +1327,7 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,
goto put_and_exit; goto put_and_exit;
*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash)); *own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));
if (*own_req) if (*own_req)
tcp_move_syn(newtp, req_unhash); tcp_move_syn(newtp, req);
return newsk; return newsk;

2
net/ipv6/tcp_ipv6.c
View file

@ -1141,7 +1141,7 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff *
} }
*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash)); *own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));
if (*own_req) { if (*own_req) {
tcp_move_syn(newtp, req_unhash); tcp_move_syn(newtp, req);
/* Clone pktoptions received with SYN, if we own the req */ /* Clone pktoptions received with SYN, if we own the req */
if (ireq->pktopts) { if (ireq->pktopts) {