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

Commit dc8390f9 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

dccp: do not use ipv6 header for ipv4 flow 



[ Upstream commit e0aa67709f89d08c8d8e5bdd9e0b649df61d0090 ]

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

Fixes: 3df80d93 ("[DCCP]: Introduce DCCPv6")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6f9eda3

net/dccp/ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -431,8 +431,8 @@ static struct sock *dccp_v6_request_recv_sock(const struct sock *sk, 
		newnp->ipv6_mc_list = NULL;

		newnp->ipv6_ac_list = NULL;

		newnp->ipv6_fl_list = NULL;

		newnp->mcast_oif   = inet6_iif(skb);

		newnp->mcast_hops  = ipv6_hdr(skb)->hop_limit;

		newnp->mcast_oif   = inet_iif(skb);

		newnp->mcast_hops  = ip_hdr(skb)->ttl;



		/*

		 * No need to charge this sock to the relevant IPv6 refcnt debug socks count