From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT 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 8D574C282C8 for ; Mon, 28 Jan 2019 21:24:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 60F6C2171F for ; Mon, 28 Jan 2019 21:24:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728066AbfA1VYe (ORCPT ); Mon, 28 Jan 2019 16:24:34 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53521 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726798AbfA1VYe (ORCPT ); Mon, 28 Jan 2019 16:24:34 -0500 Received: by mail-wm1-f65.google.com with SMTP id d15so15621021wmb.3 for ; Mon, 28 Jan 2019 13:24:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vszWZim0r47EvF9S2YqV2cHRupEbFvIjwq1PFZJhHvQ=; b=r/GptSZBG57j+nwXYzGTRRLoXOTTyyuzZySiPeTT7V9vmkV9eJ9ZlyaIjamCKalAl+ l8XM7HFOI4vj2XuKZY+25/4f0pKCu+6g0GhhI8nMDc5h555+kI8IXB9SfkxIH68cfYUv bwCRq0rFqugRuPtqDe9eYSn3nmKQpr4GppSFE7Pk9oP6pUdrmZmbq9SD3Am1Z8UJTrOM aiDVYNxFOPNfKlcwsEQ9jLRwxHOMJxa3P/Lo8MkQgpEOGb0pYEInCoJqHUYuo3vRSmhy rhcLdAWMqH+9ZfgO30InyTRkFgPrP0bPmbuMaBrZpt+lbfmy423jyQLk4aiSa4F0l4Ln Bxlg== X-Gm-Message-State: AJcUukf1xistk1SLtRRToVEbmKoeFtEa6UWVX4yToSSeU8m498OLGTwl afvsGRtYawuWYXzaEUK1xdEmcg== X-Google-Smtp-Source: ALg8bN66VwtxhuXvCcsYwdwP0qHPALu8vaiks3bLona8VYxn2vgmrxfTJtxWIXsKzI3fazzlcx+oaw== X-Received: by 2002:a1c:2c6:: with SMTP id 189mr18018771wmc.21.1548710671675; Mon, 28 Jan 2019 13:24:31 -0800 (PST) Received: from localhost.lan ([151.66.10.5]) by smtp.gmail.com with ESMTPSA id i192sm538027wmg.7.2019.01.28.13.24.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 28 Jan 2019 13:24:30 -0800 (PST) From: Lorenzo Bianconi To: davem@davemloft.net Cc: netdev@vger.kernel.org, u9012063@gmail.com Subject: [PATCH net 2/2] net: ip6_gre: always reports o_key to userspace Date: Mon, 28 Jan 2019 22:23:49 +0100 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As Erspan_v4, Erspan_v6 protocol relies on o_key to configure session id header field. However TUNNEL_KEY bit is cleared in ip6erspan_tunnel_xmit since ERSPAN protocol does not set the key field of the external GRE header and so the configured o_key is not reported to userspace. The issue can be triggered with the following reproducer: $ip link add ip6erspan1 type ip6erspan local 2000::1 remote 2000::2 \ key 1 seq erspan_ver 1 $ip link set ip6erspan1 up ip -d link sh ip6erspan1 ip6erspan1@NONE: mtu 1422 qdisc noop state DOWN mode DEFAULT link/ether ba:ff:09:24:c3:0e brd ff:ff:ff:ff:ff:ff promiscuity 0 minmtu 68 maxmtu 1500 ip6erspan remote 2000::2 local 2000::1 encaplimit 4 flowlabel 0x00000 ikey 0.0.0.1 iseq oseq Fix the issue adding TUNNEL_KEY bit to the o_flags parameter in ip6gre_fill_info Fixes: 5a963eb61b7c ("ip6_gre: Add ERSPAN native tunnel support") Signed-off-by: Lorenzo Bianconi --- net/ipv6/ip6_gre.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 4416368dbd49..801a9a0c217e 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -2098,12 +2098,17 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev) { struct ip6_tnl *t = netdev_priv(dev); struct __ip6_tnl_parm *p = &t->parms; + __be16 o_flags = p->o_flags; + + if ((p->erspan_ver == 1 || p->erspan_ver == 2) && + !p->collect_md) + o_flags |= TUNNEL_KEY; if (nla_put_u32(skb, IFLA_GRE_LINK, p->link) || nla_put_be16(skb, IFLA_GRE_IFLAGS, gre_tnl_flags_to_gre_flags(p->i_flags)) || nla_put_be16(skb, IFLA_GRE_OFLAGS, - gre_tnl_flags_to_gre_flags(p->o_flags)) || + gre_tnl_flags_to_gre_flags(o_flags)) || nla_put_be32(skb, IFLA_GRE_IKEY, p->i_key) || nla_put_be32(skb, IFLA_GRE_OKEY, p->o_key) || nla_put_in6_addr(skb, IFLA_GRE_LOCAL, &p->laddr) || -- 2.20.1