From patchwork Wed Feb 12 18:07:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kelsey Skunberg X-Patchwork-Id: 1236980 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Hng90pRnz9sRN; Thu, 13 Feb 2020 05:07:48 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1j1wQK-0003SY-D6; Wed, 12 Feb 2020 18:07:44 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j1wQI-0003S7-Pk for kernel-team@lists.ubuntu.com; Wed, 12 Feb 2020 18:07:42 +0000 Received: from mail-io1-f69.google.com ([209.85.166.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j1wQI-0001lo-En for kernel-team@lists.ubuntu.com; Wed, 12 Feb 2020 18:07:42 +0000 Received: by mail-io1-f69.google.com with SMTP id d13so2244997ioo.23 for ; Wed, 12 Feb 2020 10:07:42 -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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RCfXzKCKa/bNp+yzNTETxrRArrWBuD5l92z8jn03Tdo=; b=BwG7vKjQCbh1nGfX8BFWgujv9TyZTI8jO9arpSKo4Fl4UpbbTnHUkdMHuhkkAp83l2 7odj6XwK+n8xlVshcQGO0xhDEWNcIBBEpvd8fVMiul5BRyqs+XArIETZAEegK2665po+ 5ARGeT+1D21X0H76zHHOli6e+HbosmBMoGTEZk5j5jTKh0jqU8WmP/1ybev1xvUPVPzu VZgqEpkEJexzDvrfxSsQ6wzX7Sq++La2Xf1BdDb4XYI74DVDnEH8zpzj54m3ymWuCJld SEd8gJP3JyvdbuPRTByZ6R6IMLXESNCp3NYdQiWWQhMQeID85z/BssSU81fGqMbiGlc3 mGag== X-Gm-Message-State: APjAAAWeTYhG9+PmTqQo5FMOSZGtI9yLVWHzd7jCdJJWXC8fcd5eE9bq 9OiFntmyr3DUHbH1gvKU+HKziPrtlGV/kgKeDXSZNh5d19n3d//Llu/+jlVWBfoI2Oo0kKu/xdX L/lg6n1VfzPqHiP9cdn27McUGwThL+CyE/gLR4B8lfg== X-Received: by 2002:a02:ce9b:: with SMTP id y27mr4542940jaq.46.1581530861284; Wed, 12 Feb 2020 10:07:41 -0800 (PST) X-Google-Smtp-Source: APXvYqxOYxcN1axKo6HD1epi/pJwwFzo7OujnZ3hFwtscwHaIz5clrQD9BvDCQN0V2yM1T667xHfAw== X-Received: by 2002:a02:ce9b:: with SMTP id y27mr4542912jaq.46.1581530860974; Wed, 12 Feb 2020 10:07:40 -0800 (PST) Received: from localhost.localdomain (c-73-243-191-173.hsd1.co.comcast.net. [73.243.191.173]) by smtp.gmail.com with ESMTPSA id a21sm259044ioh.29.2020.02.12.10.07.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 10:07:40 -0800 (PST) From: Kelsey Skunberg To: kernel-team@lists.ubuntu.com Subject: [SRU][F/E/B/X][PATCH v2 1/2] vti[6]: fix packet tx through bpf_redirect() Date: Wed, 12 Feb 2020 11:07:28 -0700 Message-Id: <20200212180729.10428-2-kelsey.skunberg@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200212180729.10428-1-kelsey.skunberg@canonical.com> References: <20200212180729.10428-1-kelsey.skunberg@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Nicolas Dichtel BugLink: https://bugs.launchpad.net/bugs/1860969 With an ebpf program that redirects packets through a vti[6] interface, the packets are dropped because no dst is attached. This could also be reproduced with an AF_PACKET socket, with the following python script (vti1 is an ip_vti interface): import socket send_s = socket.socket(socket.AF_PACKET, socket.SOCK_RAW, 0) # scapy # p = IP(src='10.100.0.2', dst='10.200.0.1')/ICMP(type='echo-request') # raw(p) req = b'E\x00\x00\x1c\x00\x01\x00\x00@\x01e\xb2\nd\x00\x02\n\xc8\x00\x01\x08\x00\xf7\xff\x00\x00\x00\x00' send_s.sendto(req, ('vti1', 0x800, 0, 0)) Signed-off-by: Nicolas Dichtel Signed-off-by: Steffen Klassert (cherry picked from commit 95224166a9032ff5d08fca633d37113078ce7d01) Signed-off-by: Kelsey Skunberg --- net/ipv4/ip_vti.c | 13 +++++++++++-- net/ipv6/ip6_vti.c | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index cfb025606793..8064e5750b65 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -187,8 +187,17 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev, int mtu; if (!dst) { - dev->stats.tx_carrier_errors++; - goto tx_error_icmp; + 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)) { + dev->stats.tx_carrier_errors++; + goto tx_error_icmp; + } + dst = &rt->dst; + skb_dst_set(skb, dst); } dst_hold(dst); diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 4aa31ccd8a33..f11916120ef3 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -449,8 +449,17 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) int err = -1; int mtu; - if (!dst) - goto tx_err_link_failure; + 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; + goto tx_err_link_failure; + } + skb_dst_set(skb, dst); + } dst_hold(dst); dst = xfrm_lookup(t->net, dst, fl, NULL, 0);