From patchwork Mon Oct 24 11:28:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9065 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp444538wru; Mon, 24 Oct 2022 06:11:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4eqGKUIdkWNBKgj3IymrkmxzBiPrX5W2+fMm8PCAk3l0Y054b+WbxYCRbydCnEJ4hBXAN0 X-Received: by 2002:a05:6a02:11a:b0:441:9db5:e8cc with SMTP id bg26-20020a056a02011a00b004419db5e8ccmr27551773pgb.345.1666617080974; Mon, 24 Oct 2022 06:11:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666617080; cv=none; d=google.com; s=arc-20160816; b=V3DdoS5RfSCSsZ4zj/on2hKr6cnYhRTZdZASMdGKdNKGE38qYBVULtZo9B8VG+pJXk D30eApBQaD40cOaZ+cCikYBm4LOomzCvTQyoatVlJ1kM2Lu7tRDuwRNK8AgPtThMdSMV mKBrNmY7GkMW3aiIV9WDhuYM0uP9/mOnKCesXlrvSGp7AvA8kJXQB6wdtYAqddJiuLLs l5tKTwF2dvyP3xqW4WfOgzdJNXuNw12ZlverSBOwjFCgexUB2NT6RX2ecD8BRK4qKjoy pJ4WsbMJb0HgyFs6UU1p5yugr5pgVxpEVyd6d8trg9vSVZPiNTvaVTiTDHZR3cbkkRbj DxMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Zkz/SdCdnhjlRm9svCfP+19FxgAhL5I8C23kRcK8J/8=; b=oTwHh3+KuAAaUHkJRd+6MV9DlDvSjC0bwpdpOffkeuRs8mqq5J7hTE/bZLgrdkBR6y PbCKEZWKdzaLrFf5gHvEQ3Hpoq9b3qDRZ3MhAWbW5zquhgYvplI9cnnkFhzpJ8gRxrdu FHGRvQB/zmWpTOqGF1rb6FVN5NUOumG34Z+wBEgEZ6rpA/p8KFJKmv4PHzFxbBapbf8M u5UXxZK8T6PXxnHkpwLd+JLDr1Su4ldvZgXAGXkshBhkwCzPgo8ffK+cnQGTVFNOd8Ez Bp6hHLIIufMeXEJ0zR1RRTKZETyulTEl4tf6MGQJCZ77EGlGHrTPJAQ02GiLjQwvEOjR yIFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VEousFjg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l9-20020a170903120900b00176b8c373ddsi38433919plh.257.2022.10.24.06.11.04; Mon, 24 Oct 2022 06:11:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VEousFjg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235492AbiJXNKu (ORCPT + 99 others); Mon, 24 Oct 2022 09:10:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235388AbiJXNIh (ORCPT ); Mon, 24 Oct 2022 09:08:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DC249E2DA; Mon, 24 Oct 2022 05:21:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 091F961218; Mon, 24 Oct 2022 12:21:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F2BEC433C1; Mon, 24 Oct 2022 12:21:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614087; bh=786S+Dn2aWcaP69zrtbMp2Xt408gllhiKlEpepX6aYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VEousFjgmwBjYYKiF6l4uWZVylvZUrpBbIvZwLxK4ZlFkXVRbiRPUWRtjv4CUE/K+ snqqLtlV9WjPnEzIqr4Zz6qSGG4HuqtXAbEGv4U4eHkGSMrhAJIB8neyy/hfwBsdHo Z59FOkMUBpq3DHydjtAAbiIeBYhrKK/l+Ulf4W9w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Phil Sutter , Florian Westphal , Sasha Levin Subject: [PATCH 5.10 128/390] netfilter: nft_fib: Fix for rpath check with VRF devices Date: Mon, 24 Oct 2022 13:28:45 +0200 Message-Id: <20221024113028.115912249@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747574672270721103?= X-GMAIL-MSGID: =?utf-8?q?1747574672270721103?= From: Phil Sutter [ Upstream commit 2a8a7c0eaa8747c16aa4a48d573aa920d5c00a5c ] Analogous to commit b575b24b8eee3 ("netfilter: Fix rpfilter dropping vrf packets by mistake") but for nftables fib expression: Add special treatment of VRF devices so that typical reverse path filtering via 'fib saddr . iif oif' expression works as expected. Fixes: f6d0cbcf09c50 ("netfilter: nf_tables: add fib expression") Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal Signed-off-by: Sasha Levin --- net/ipv4/netfilter/nft_fib_ipv4.c | 3 +++ net/ipv6/netfilter/nft_fib_ipv6.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/net/ipv4/netfilter/nft_fib_ipv4.c b/net/ipv4/netfilter/nft_fib_ipv4.c index 03df986217b7..9e6f0f1275e2 100644 --- a/net/ipv4/netfilter/nft_fib_ipv4.c +++ b/net/ipv4/netfilter/nft_fib_ipv4.c @@ -83,6 +83,9 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs, else oif = NULL; + if (priv->flags & NFTA_FIB_F_IIF) + fl4.flowi4_oif = l3mdev_master_ifindex_rcu(oif); + if (nft_hook(pkt) == NF_INET_PRE_ROUTING && nft_fib_is_loopback(pkt->skb, nft_in(pkt))) { nft_fib_store_result(dest, priv, nft_in(pkt)); diff --git a/net/ipv6/netfilter/nft_fib_ipv6.c b/net/ipv6/netfilter/nft_fib_ipv6.c index 92f3235fa287..602743f6dcee 100644 --- a/net/ipv6/netfilter/nft_fib_ipv6.c +++ b/net/ipv6/netfilter/nft_fib_ipv6.c @@ -37,6 +37,9 @@ static int nft_fib6_flowi_init(struct flowi6 *fl6, const struct nft_fib *priv, if (ipv6_addr_type(&fl6->daddr) & IPV6_ADDR_LINKLOCAL) { lookup_flags |= RT6_LOOKUP_F_IFACE; fl6->flowi6_oif = get_ifindex(dev ? dev : pkt->skb->dev); + } else if ((priv->flags & NFTA_FIB_F_IIF) && + (netif_is_l3_master(dev) || netif_is_l3_slave(dev))) { + fl6->flowi6_oif = dev->ifindex; } if (ipv6_addr_type(&fl6->saddr) & IPV6_ADDR_UNICAST) @@ -193,7 +196,8 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs, if (rt->rt6i_flags & (RTF_REJECT | RTF_ANYCAST | RTF_LOCAL)) goto put_rt_err; - if (oif && oif != rt->rt6i_idev->dev) + if (oif && oif != rt->rt6i_idev->dev && + l3mdev_master_ifindex_rcu(rt->rt6i_idev->dev) != oif->ifindex) goto put_rt_err; nft_fib_store_result(dest, priv, rt->rt6i_idev->dev);