Commit ce105008 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp/dccp: fix ireq->pktopts race 



IPv6 request sockets store a pointer to skb containing the SYN packet
to be able to transfer it to full blown socket when 3WHS is done
(ireq->pktopts -> np->pktoptions)

As explained in commit 5e0724d0 ("tcp/dccp: fix hashdance race for
passive sessions"), we must transfer the skb only if we won the
hashdance race, if multiple cpus receive the 'ack' packet completing
3WHS at the same time.

Fixes: e994b2f0 ("tcp: do not lock listener to process SYN packets")
Fixes: 079096f1 ("tcp/dccp: install syn_recv requests into ehash table")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b565434

net/dccp/ipv6.c

+8 −8
Original line number Diff line number Diff line
@@ -477,15 +477,7 @@ static struct sock *dccp_v6_request_recv_sock(const struct sock *sk, 
	/* Clone RX bits */

	newnp->rxopt.all = np->rxopt.all;



	/* Clone pktoptions received with SYN */

	newnp->pktoptions = NULL;

	if (ireq->pktopts != NULL) {

		newnp->pktoptions = skb_clone(ireq->pktopts, GFP_ATOMIC);

		consume_skb(ireq->pktopts);

		ireq->pktopts = NULL;

		if (newnp->pktoptions)

			skb_set_owner_r(newnp->pktoptions, newsk);

	}

	newnp->opt	  = NULL;

	newnp->mcast_oif  = inet6_iif(skb);

	newnp->mcast_hops = ipv6_hdr(skb)->hop_limit;
@@ -515,6 +507,14 @@ static struct sock *dccp_v6_request_recv_sock(const struct sock *sk, 
		goto out;

	}

	*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));

	/* Clone pktoptions received with SYN, if we own the req */

	if (*own_req && ireq->pktopts) {

		newnp->pktoptions = skb_clone(ireq->pktopts, GFP_ATOMIC);

		consume_skb(ireq->pktopts);

		ireq->pktopts = NULL;

		if (newnp->pktoptions)

			skb_set_owner_r(newnp->pktoptions, newsk);

	}



	return newsk;

net/ipv6/tcp_ipv6.c

+9 −9
Original line number Diff line number Diff line
@@ -1084,16 +1084,7 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff * 
	/* Clone RX bits */

	newnp->rxopt.all = np->rxopt.all;



	/* Clone pktoptions received with SYN */

	newnp->pktoptions = NULL;

	if (ireq->pktopts) {

		newnp->pktoptions = skb_clone(ireq->pktopts,

					      sk_gfp_atomic(sk, GFP_ATOMIC));

		consume_skb(ireq->pktopts);

		ireq->pktopts = NULL;

		if (newnp->pktoptions)

			skb_set_owner_r(newnp->pktoptions, newsk);

	}

	newnp->opt	  = NULL;

	newnp->mcast_oif  = tcp_v6_iif(skb);

	newnp->mcast_hops = ipv6_hdr(skb)->hop_limit;
@@ -1149,6 +1140,15 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff * 
		goto out;

	}

	*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));

	/* Clone pktoptions received with SYN, if we own the req */

	if (*own_req && ireq->pktopts) {

		newnp->pktoptions = skb_clone(ireq->pktopts,

					      sk_gfp_atomic(sk, GFP_ATOMIC));

		consume_skb(ireq->pktopts);

		ireq->pktopts = NULL;

		if (newnp->pktoptions)

			skb_set_owner_r(newnp->pktoptions, newsk);

	}



	return newsk;

CRA Git | Maintained and supported by SUSTech CRA and CCSE