| Message ID | 20220419134701.153090-3-martin@strongswan.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | netfilter: Fix/update mangled packet re-routing within VRF domains | expand |
On 4/19/22 7:47 AM, Martin Willi wrote: > Commit 40867d74c374 ("net: Add l3mdev index to flow struct and avoid oif > reset for port devices") introduces a flow key specific for layer 3 > domains, such as a VRF master device. This allows for explicit VRF domain > selection instead of abusing the oif flow key. > > Update ip[6]_route_me_harder() to make use of that new key when re-routing > mangled packets within VRFs instead of setting the flow oif, making it > consistent with other users. > > Signed-off-by: Martin Willi <martin@strongswan.org> > --- > net/ipv4/netfilter.c | 3 +-- > net/ipv6/netfilter.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > This one will go to -next Reviewed-by: David Ahern <dsahern@kernel.org>
On Tue, Apr 19, 2022 at 03:47:01PM +0200, Martin Willi wrote: > Commit 40867d74c374 ("net: Add l3mdev index to flow struct and avoid oif > reset for port devices") introduces a flow key specific for layer 3 > domains, such as a VRF master device. This allows for explicit VRF domain > selection instead of abusing the oif flow key. > > Update ip[6]_route_me_harder() to make use of that new key when re-routing > mangled packets within VRFs instead of setting the flow oif, making it > consistent with other users. Applied to nf-next
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c index aff707988e23..bd135165482a 100644 --- a/net/ipv4/netfilter.c +++ b/net/ipv4/netfilter.c @@ -45,8 +45,7 @@ int ip_route_me_harder(struct net *net, struct sock *sk, struct sk_buff *skb, un fl4.saddr = saddr; fl4.flowi4_tos = RT_TOS(iph->tos); fl4.flowi4_oif = sk ? sk->sk_bound_dev_if : 0; - if (!fl4.flowi4_oif) - fl4.flowi4_oif = l3mdev_master_ifindex(dev); + fl4.flowi4_l3mdev = l3mdev_master_ifindex(dev); fl4.flowi4_mark = skb->mark; fl4.flowi4_flags = flags; fib4_rules_early_flow_dissect(net, skb, &fl4, &flkeys); diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c index 8ce60ab89015..857713d7a38a 100644 --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c @@ -31,6 +31,7 @@ int ip6_route_me_harder(struct net *net, struct sock *sk_partial, struct sk_buff int strict = (ipv6_addr_type(&iph->daddr) & (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL)); struct flowi6 fl6 = { + .flowi6_l3mdev = l3mdev_master_ifindex(dev), .flowi6_mark = skb->mark, .flowi6_uid = sock_net_uid(net, sk), .daddr = iph->daddr, @@ -42,8 +43,6 @@ int ip6_route_me_harder(struct net *net, struct sock *sk_partial, struct sk_buff fl6.flowi6_oif = sk->sk_bound_dev_if; else if (strict) fl6.flowi6_oif = dev->ifindex; - else - fl6.flowi6_oif = l3mdev_master_ifindex(dev); fib6_rules_early_flow_dissect(net, skb, &fl6, &flkeys); dst = ip6_route_output(net, sk, &fl6);
Commit 40867d74c374 ("net: Add l3mdev index to flow struct and avoid oif reset for port devices") introduces a flow key specific for layer 3 domains, such as a VRF master device. This allows for explicit VRF domain selection instead of abusing the oif flow key. Update ip[6]_route_me_harder() to make use of that new key when re-routing mangled packets within VRFs instead of setting the flow oif, making it consistent with other users. Signed-off-by: Martin Willi <martin@strongswan.org> --- net/ipv4/netfilter.c | 3 +-- net/ipv6/netfilter.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)