diff options
author | Phil Sutter <phil@nwl.cc> | 2022-10-05 18:07:05 +0200 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2022-10-12 14:08:15 +0200 |
commit | acc641ab95b66b813c1ce856c377a2bbe71e7f52 (patch) | |
tree | 4add7238511a0af8eea9fe77892887b0cb0bb2a0 /net/ipv4/netfilter/ipt_rpfilter.c | |
parent | 6e31ce831c63bd7aec8ff9cc2a6d50ee8c4d4e04 (diff) | |
download | linux-acc641ab95b66b813c1ce856c377a2bbe71e7f52.tar.gz |
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/ipt_rpfilter.c')
-rw-r--r-- | net/ipv4/netfilter/ipt_rpfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ipt_rpfilter.c b/net/ipv4/netfilter/ipt_rpfilter.c index 8183bbcabb4af..ff85db52b2e56 100644 --- a/net/ipv4/netfilter/ipt_rpfilter.c +++ b/net/ipv4/netfilter/ipt_rpfilter.c @@ -77,7 +77,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par) flow.flowi4_mark = info->flags & XT_RPFILTER_VALID_MARK ? skb->mark : 0; flow.flowi4_tos = iph->tos & IPTOS_RT_MASK; flow.flowi4_scope = RT_SCOPE_UNIVERSE; - flow.flowi4_oif = l3mdev_master_ifindex_rcu(xt_in(par)); + flow.flowi4_l3mdev = l3mdev_master_ifindex_rcu(xt_in(par)); return rpfilter_lookup_reverse(xt_net(par), &flow, xt_in(par), info->flags) ^ invert; } |