Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53FBDC43381 for ; Tue, 19 Mar 2019 12:46:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1522B2146E for ; Tue, 19 Mar 2019 12:46:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="e4wmEaAa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727689AbfCSMqZ (ORCPT ); Tue, 19 Mar 2019 08:46:25 -0400 Received: from mail-vk1-f202.google.com ([209.85.221.202]:51528 "EHLO mail-vk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726466AbfCSMqY (ORCPT ); Tue, 19 Mar 2019 08:46:24 -0400 Received: by mail-vk1-f202.google.com with SMTP id f142so8566920vkd.18 for ; Tue, 19 Mar 2019 05:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=XZ93iL7Ul81iQsb284vKEgtOCdK9Cyt5DtHfCuJtQSg=; b=e4wmEaAa+pNJsmnrEO6TQ6DruXJjgcI7KQFBlOJi1I7/Cf8+MHR6OFOYjp5Ya1kxsL dYcEVPiqKJvwnE8ZSt2k7mZ9di0tjHg6ZpTDDx7kGd/oDqp2/pUUL87XBn83U0ncHlPe qc21yHcvitRleQdVBWKw5W8dqjUSW6zeClBS8kdITF+zZg/TzCwviG/1ChDn5MuxNZ0M oXHezM5U+6m6HNKhxED1LJ7GhghBpc8yWVBGQCzAFOqa033iCVQj84KvFOqjhAXM4HYG flYc4g7ul6u9sXYawYQEkDAt6fOwMAeBJmEo2EEuIizFl9GnKqdpsL9zU0mtmOGUOXas 1e1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=XZ93iL7Ul81iQsb284vKEgtOCdK9Cyt5DtHfCuJtQSg=; b=UPNllSflIBrmgMonN9JshuOvYkEokMBYR8zniakXBz+LJY7Zyxu2eyDj3SnYSxNlYY jq/arBc3A/lW8i47dadrqrGl9d74V88BKnAzK8QS0bSJnCKc7DcCsV4rnTy0k1oIqzv9 FqAxbHWAoEoC61BzSu3gECd1XCl4wT9AJCuKov9rwCmEaenh8CcaJiYqKrlzx6UBdsIv +CEGRAMBFG9zHQPYjKjAifw7vQvqG1/VdypHDSLj9nIbTi02XzvcWBUkDBZID/ErnysO gPOyH+Xa6VpzPmWqVTTrq7Gbf+8rQAmpsFI3sxXWxlmhwzBqzrnIGzsORv8HqnrpllgE NSMQ== X-Gm-Message-State: APjAAAVqw/HVaSyrtxCHpl/FFjJx0kn5MZBWloIGJd18zEYpZbS89JIC 6PjJ8eiyC0rQdppBu3HI0ueTqxNdS2TnKw== X-Google-Smtp-Source: APXvYqwSHUmIh0fEV8iF0l90/Wp5md0YvMZ7poVl3FVOMqmEnLtg86UqrNMXO9KNdmfJhfy7dY8PaJUhGzhgNQ== X-Received: by 2002:a1f:9644:: with SMTP id y65mr13991075vkd.23.1552999583222; Tue, 19 Mar 2019 05:46:23 -0700 (PDT) Date: Tue, 19 Mar 2019 05:46:18 -0700 Message-Id: <20190319124618.57929-1-edumazet@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.225.g810b269d1ac-goog Subject: [PATCH net] dccp: do not use ipv6 header for ipv4 flow From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- net/dccp/ipv6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index d5740bad5b1811cd42e44fb3b0da6edabbf18095..57d84e9b7b6fc820a4616e3ac326633f14e2fd95 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -436,8 +436,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 -- 2.21.0.225.g810b269d1ac-goog