Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp847580pja; Wed, 1 Apr 2020 09:46:33 -0700 (PDT) X-Google-Smtp-Source: APiQypJ0z7+XaR6iizp89CTIE+oI05fVe8SlQGR0RabNmHBrWbvPiTwXXcg18tPIdJ8smHOu4lwx X-Received: by 2002:aca:3986:: with SMTP id g128mr3334604oia.3.1585759593741; Wed, 01 Apr 2020 09:46:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759593; cv=none; d=google.com; s=arc-20160816; b=PCuSjy98EguAHbyDKUFwPtAmrDoDcrnFV7JsepBSn+Qed0Hd6fxAwSTHdcgpwHB9WJ Fh1y9s1B3ozE9/WKHit//0uy7hS6SHIjLijDb6vug9/sCa35ZWTq7o+hofMnp9U0JNRs jQ4V7UR6p26HpqDg4dlzuHTild7jMOkwKaZ3UeIaKkOAR95meSPnpzKQ1UvQ18qlGmQr 9I33uNKCEo/Ko8zfcx2OzwmbAnS2GK1KuLW4SVYHFRvu++FS5wsxhE6gunW6x929YQfn 3PbTUjBaoNVhBMfa+Foxq6jgtUvaKTHWkJXntE567t34V9jJIe8hgbgWcdFJx8ZaOVG5 t/UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=X2DSzh1lSBu6a46mTYzacBa1u/BTiMvYFF0wLNN6z1o=; b=ss16dyQNJe0drVx26OLr9V++9tYSWy3rc3xMRfB8GyGixTxNlhH25LeqqZbXw6QC1V K50J8g+/QaHGwL6SgpIePBDA3u0kASzJaSGif15PHL/HohQyNu/c7MXj6VfSPFMpGxvU NOocQZVAak1WovfWJ5BTTJZXUiB8qppmXnkuQUrD68+/6Ek3P0dM4TSgW/knAzUS0h6r hu9ncA9sH1n+JnDFjpzk9UaVVkN2k6RKBbv49VCaYXizzK8afscZuf0rIvJL0aVQkiyF /C7NONwrAhEoQC0FRv1pc2kotJau1nJX0bb56UmWzgKvLlBubegkhIJVBV3INDq7U08d ELmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xpbaIWd5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y25si1229209otj.304.2020.04.01.09.46.21; Wed, 01 Apr 2020 09:46:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xpbaIWd5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389836AbgDAQpT (ORCPT + 99 others); Wed, 1 Apr 2020 12:45:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:46498 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389606AbgDAQpS (ORCPT ); Wed, 1 Apr 2020 12:45:18 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B17DE20714; Wed, 1 Apr 2020 16:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759516; bh=kszjZ/bdSsWD6f8lY0uRpGz3GdLnkGv7gJ+KTnfA+Zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xpbaIWd57lBLHQef/CLv6iv6WHfuUGr4c9Vp9vi3VPkwTKPGKUXudY5oPLal5wJHo kNEm9b95kQUqPKDzzbO3mtxHQeUAbqF8qZ9GQO0r+italZKAoCNReN7yznA7J6oKKM 0VGRq2ODYycS3IcIWp1hsA25Z0xz3BMlZfDDQRmQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Dichtel , Steffen Klassert Subject: [PATCH 4.14 104/148] vti[6]: fix packet tx through bpf_redirect() in XinY cases Date: Wed, 1 Apr 2020 18:18:16 +0200 Message-Id: <20200401161602.698602231@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicolas Dichtel commit f1ed10264ed6b66b9cd5e8461cffce69be482356 upstream. I forgot the 4in6/6in4 cases in my previous patch. Let's fix them. Fixes: 95224166a903 ("vti[6]: fix packet tx through bpf_redirect()") Signed-off-by: Nicolas Dichtel Signed-off-by: Steffen Klassert Signed-off-by: Greg Kroah-Hartman --- net/ipv4/Kconfig | 1 + net/ipv4/ip_vti.c | 36 +++++++++++++++++++++++++++++------- net/ipv6/ip6_vti.c | 32 +++++++++++++++++++++++++------- 3 files changed, 55 insertions(+), 14 deletions(-) --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -297,6 +297,7 @@ config SYN_COOKIES config NET_IPVTI tristate "Virtual (secure) IP: tunneling" + depends on IPV6 || IPV6=n select INET_TUNNEL select NET_IP_TUNNEL depends on INET_XFRM_MODE_TUNNEL --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -208,17 +208,39 @@ static netdev_tx_t vti_xmit(struct sk_bu int mtu; if (!dst) { - struct rtable *rt; + switch (skb->protocol) { + case htons(ETH_P_IP): { + struct rtable *rt; - fl->u.ip4.flowi4_oif = dev->ifindex; - fl->u.ip4.flowi4_flags |= FLOWI_FLAG_ANYSRC; - rt = __ip_route_output_key(dev_net(dev), &fl->u.ip4); - if (IS_ERR(rt)) { + fl->u.ip4.flowi4_oif = dev->ifindex; + fl->u.ip4.flowi4_flags |= FLOWI_FLAG_ANYSRC; + rt = __ip_route_output_key(dev_net(dev), &fl->u.ip4); + if (IS_ERR(rt)) { + dev->stats.tx_carrier_errors++; + goto tx_error_icmp; + } + dst = &rt->dst; + skb_dst_set(skb, dst); + break; + } +#if IS_ENABLED(CONFIG_IPV6) + case htons(ETH_P_IPV6): + fl->u.ip6.flowi6_oif = dev->ifindex; + fl->u.ip6.flowi6_flags |= FLOWI_FLAG_ANYSRC; + dst = ip6_route_output(dev_net(dev), NULL, &fl->u.ip6); + if (dst->error) { + dst_release(dst); + dst = NULL; + dev->stats.tx_carrier_errors++; + goto tx_error_icmp; + } + skb_dst_set(skb, dst); + break; +#endif + default: dev->stats.tx_carrier_errors++; goto tx_error_icmp; } - dst = &rt->dst; - skb_dst_set(skb, dst); } dst_hold(dst); --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -454,15 +454,33 @@ vti6_xmit(struct sk_buff *skb, struct ne int mtu; if (!dst) { - fl->u.ip6.flowi6_oif = dev->ifindex; - fl->u.ip6.flowi6_flags |= FLOWI_FLAG_ANYSRC; - dst = ip6_route_output(dev_net(dev), NULL, &fl->u.ip6); - if (dst->error) { - dst_release(dst); - dst = NULL; + switch (skb->protocol) { + case htons(ETH_P_IP): { + struct rtable *rt; + + fl->u.ip4.flowi4_oif = dev->ifindex; + fl->u.ip4.flowi4_flags |= FLOWI_FLAG_ANYSRC; + rt = __ip_route_output_key(dev_net(dev), &fl->u.ip4); + if (IS_ERR(rt)) + goto tx_err_link_failure; + dst = &rt->dst; + skb_dst_set(skb, dst); + break; + } + case htons(ETH_P_IPV6): + fl->u.ip6.flowi6_oif = dev->ifindex; + fl->u.ip6.flowi6_flags |= FLOWI_FLAG_ANYSRC; + dst = ip6_route_output(dev_net(dev), NULL, &fl->u.ip6); + if (dst->error) { + dst_release(dst); + dst = NULL; + goto tx_err_link_failure; + } + skb_dst_set(skb, dst); + break; + default: goto tx_err_link_failure; } - skb_dst_set(skb, dst); } dst_hold(dst);