From: Eric Dumazet Date: Tue, 19 Mar 2019 12:46:18 +0000 (-0700) Subject: dccp: do not use ipv6 header for ipv4 flow X-Git-Tag: v3.16.72~126 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9bf2079f179a04c0b0d2fcbd6069c1713eeee6d;p=thirdparty%2Fkernel%2Fstable.git dccp: do not use ipv6 header for ipv4 flow commit e0aa67709f89d08c8d8e5bdd9e0b649df61d0090 upstream. When a dual stack dccp listener accepts an ipv4 flow, it should not attempt to use an ipv6 header or inet6_iif() helper. Fixes: 3df80d9320bc ("[DCCP]: Introduce DCCPv6") Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings --- diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 30455bf91b182..c3ed865d262f8 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -491,8 +491,8 @@ static struct sock *dccp_v6_request_recv_sock(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