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 2EF8CC43381 for ; Tue, 19 Mar 2019 12:45:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F197720685 for ; Tue, 19 Mar 2019 12:45:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="AJ7ijhvU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727654AbfCSMpk (ORCPT ); Tue, 19 Mar 2019 08:45:40 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:45051 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726053AbfCSMpk (ORCPT ); Tue, 19 Mar 2019 08:45:40 -0400 Received: by mail-pg1-f202.google.com with SMTP id 18so3420885pgx.11 for ; Tue, 19 Mar 2019 05:45:39 -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=Zr1Bn4vQgARyiO5HZuShqLmUP+Xwvrs2ucswk/yYNxk=; b=AJ7ijhvUKFq7JpQs/+7wrGlbZf9A4RKwVVLk19xfa1wsUwX3JHpuIPP7DC/zH8POZB MgMF5h0+4gKgIUVJrRIuyBrTtqhKWMM8fj+Ewmiw+0A88iuPBICnIbMWfZORqDNQwzFe v62Go7LUvk6hrBoL/Y3sWEbpKa2PRWNr7bUxdzsU4e1wvofUBQZiv2UNrfNGHRW40Ubl 24JOagb6iwOouskXOJX3ErMPyEYFxqKPXH01Ts3Opw4kV/tVHAKUqLZL2j9cImmzO02x qGN2/S/m+M0IMV9fGU1W7HXmnzkCu6YAmVPxz39bBcvjwl5OIiGs2wgge31wtiz/8Z8K a5DA== 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=Zr1Bn4vQgARyiO5HZuShqLmUP+Xwvrs2ucswk/yYNxk=; b=dnqiARdr83GCwM37WjIpVlhwD3j6EJfUR3S5IbwrQt1jnxDQ4iegKWHnCIXRX0cLUH +frK48qbsP+QQgkoYnirdTtXwsKI9l730T50phZgeIayaVB13KcAHwjADfMD7mBoV47F I7g3RRDREVag8qq7B2DAGbyM1ZFUbegAwVGSJOoUN3Wa4MJvbsE3XSyal5aaGU5vDNGA lWaaK69IyH50TLuuUtD952A5j5eWTmbEwdEejoThvT1io2qjaIly9Bw5KEqhqOg47WU5 PiK8rHZo4vCJNjfM0FyfASius4N8U087NoPCzvthWuj8x7I+pQFtL8iDn/tERfnazKsB E2ow== X-Gm-Message-State: APjAAAV1DUYZpFdKz+s7M1rCZYvJxgS1NKXk4EVBjn5zkCypCPjyTkD3 TqsJxmQsZ+LibWNGYbAoXSXeuN3M7Ce9Jg== X-Google-Smtp-Source: APXvYqyihomP9VxrHyJlIaeqJ+LIFJAkq4VtaYi4XzLb7K5DZsQxeqBBna4KFJ88sdopBJyUt6SY0GJ4k/Hi9w== X-Received: by 2002:a63:1152:: with SMTP id 18mr8281088pgr.0.1552999539486; Tue, 19 Mar 2019 05:45:39 -0700 (PDT) Date: Tue, 19 Mar 2019 05:45:35 -0700 Message-Id: <20190319124535.57456-1-edumazet@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.225.g810b269d1ac-goog Subject: [PATCH net] tcp: 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 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") Signed-off-by: Eric Dumazet --- net/ipv6/tcp_ipv6.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 57ef69a1088908fc624ecfca99a728fa296ae0bf..44d431849d391d6903d263ae547fc9bed1e67aa7 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -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 -- 2.21.0.225.g810b269d1ac-goog