summaryrefslogtreecommitdiff
path: root/net/ipv4/netfilter/nft_fib_ipv4.c
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2022-10-05 18:07:05 +0200
committerFlorian Westphal <fw@strlen.de>2022-10-12 14:08:15 +0200
commitacc641ab95b66b813c1ce856c377a2bbe71e7f52 (patch)
tree4add7238511a0af8eea9fe77892887b0cb0bb2a0 /net/ipv4/netfilter/nft_fib_ipv4.c
parent6e31ce831c63bd7aec8ff9cc2a6d50ee8c4d4e04 (diff)
netfilter: rpfilter/fib: Populate flowic_l3mdev field
Use the introduced field for correct operation with VRF devices instead of conditionally overwriting flowic_oif. This is a partial revert of commit b575b24b8eee3 ("netfilter: Fix rpfilter dropping vrf packets by mistake"), implementing a simpler solution. Signed-off-by: Phil Sutter <phil@nwl.cc> Reviewed-by: David Ahern <dsahern@kernel.org> Reviewed-by: Guillaume Nault <gnault@redhat.com> Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'net/ipv4/netfilter/nft_fib_ipv4.c')
-rw-r--r--net/ipv4/netfilter/nft_fib_ipv4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nft_fib_ipv4.c b/net/ipv4/netfilter/nft_fib_ipv4.c
index 7ade04ff972d..e886147eed11 100644
--- a/net/ipv4/netfilter/nft_fib_ipv4.c
+++ b/net/ipv4/netfilter/nft_fib_ipv4.c
@@ -84,7 +84,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,
oif = NULL;
if (priv->flags & NFTA_FIB_F_IIF)
- fl4.flowi4_oif = l3mdev_master_ifindex_rcu(oif);
+ fl4.flowi4_l3mdev = l3mdev_master_ifindex_rcu(oif);
if (nft_hook(pkt) == NF_INET_PRE_ROUTING &&
nft_fib_is_loopback(pkt->skb, nft_in(pkt))) {