Skip to contentSkip to conversation

tcp: do not use ipv6 header for ipv4 flow

PATCH In review Eric Dumazet 2 participants 2 messages Mar 19, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tcp: do not use ipv6 header for ipv4 flow

When a dual stack tcp listener accepts an ipv4 flow,
it should not attempt to use an ipv6 header or tcp_v6_iif() helper.

Fixes 1397ed35f22d ("ipv6: add flowinfo for tcp6 pkt_options for all cases")
Fixes df3687ffc665 ("ipv6: add the IPV6_FL_F_REFLECT flag to IPV6_FL_A_GET")
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
---
 net/ipv6/tcp_ipv6.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
net/ipv6/tcp_ipv6.c +4 -4
index 57ef69a1088908fc624ecfca99a728fa296ae0bf..44d431849d391d6903d263ae547fc9bed1e67aa7 100644
@@ -1110,11 +1110,11 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff *
 		newnp->ipv6_fl_list = NULL;
 		newnp->pktoptions  = NULL;
 		newnp->opt	   = NULL;
-		newnp->mcast_oif   = tcp_v6_iif(skb);
-		newnp->mcast_hops  = ipv6_hdr(skb)->hop_limit;
-		newnp->rcv_flowinfo = ip6_flowinfo(ipv6_hdr(skb));
+		newnp->mcast_oif   = inet_iif(skb);
+		newnp->mcast_hops  = ip_hdr(skb)->ttl;
+		newnp->rcv_flowinfo = 0;
 		if (np->repflow)
-			newnp->flow_label = ip6_flowlabel(ipv6_hdr(skb));
+			newnp->flow_label = 0;
 
 		/*
 		 * No need to charge this sock to the relevant IPv6 refcnt debug socks count
Signature · 1 line
2.21.0.225.g810b269d1ac-goog
maintainer
#1 lore raw

From: Eric Dumazet <[email protected]>
Date: Tue, 19 Mar 2019 05:45:35 -0700

Quoted 7 lines

When a dual stack tcp listener accepts an ipv4 flow,
it should not attempt to use an ipv6 header or tcp_v6_iif() helper.

Fixes 1397ed35f22d ("ipv6: add flowinfo for tcp6 pkt_options for all cases")
Fixes df3687ffc665 ("ipv6: add the IPV6_FL_F_REFLECT flag to IPV6_FL_A_GET")
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")

Applied and queued up for -stable.