This is a followup of the review of the teql arp-queue fix as reported
by Sashiko.
The issue:
__bpf_redirect_neigh_v4() and __bpf_redirect_neigh_v6() install a dst for
the redirect target only when the program lets the helper do the FIB
lookup. With BPF_F_NEXTHOP the program supplies the nexthop, the lookup is
skipped, and whatever dst the packet arrived with stays attached while
bpf_out_neigh_v{4,6}() switch skb->dev to the target device. If that
device's neighbour is incomplete the packet is parked on its arp_queue with
the original route's dst; draining the queue re-looks the neighbour up from
that dst and builds the frame with the original device's link-layer header,
then transmits it on the target device.
The Fix:
Release the dst when the nexthop is supplied, so the queue drain keeps the
target device's parking neighbour and the frame carries that device's
addresses.
The release goes through skb_dst_drop_keep_metadata(), so encapsulation
parameters a route carries are handed over to a metadata dst instead of
being lost, and a metadata dst already on the packet is left in place. Both
wrappers take their existing drop path when that copy cannot be allocated,
so a packet is never sent with the stale route.
What the target device's transmit path still sees:
The released dst is the route of the device the packet arrived on, and the
packet leaves through the redirect target, so consumers of that route on
the way out lose it:
- a tunnel with no configured remote takes its outer endpoint from the
route, as it does for the netfilter producer: ip_tunnel_xmit() reads
the route's next hop, and ip6_tnl_xmit() and sit derive it from the
route as well. A redirected packet whose route carried no encapsulation
parameters is left with no dst, so it is counted as a transmit error
and dropped instead of being encapsulated towards an endpoint that
belongs to another device's path.
- the route realm goes with it, so nft meta rtclassid, nft rt classid
and bpf_get_route_realm() stop matching on that packet.
- encapsulation parameters are not lost: they moved onto the metadata
dst, so a tunnel or an xfrm interface downstream still builds its outer
header.
Taking the outer endpoint or the realm from another device's route is the
same cross-device reuse this patch removes at the neighbour lookup.
One consumer is older than this series. When a tunnel cannot take an
endpoint from the skb, ip_tunnel_xmit() and ip6_tnl_xmit() fall back to
skb_rtable(), a container_of() over whatever dst the skb carries, and a
metadata dst is not an rtable. That fallback is reachable without this
series: a tc-bpf program that calls bpf_skb_set_tunnel_key() with no
remote already hands an NBMA tunnel such a dst. The release here can leave
one behind as well, when the parameters a route carries are not usable for
the payload. The cast is repaired separately.
Conditions to recreate the bug:
Two network namespaces, A (10.10.0.1/24) and B (10.1.0.1/24) in one, their
veth peers in the other with only A's peer addressed (10.10.0.2/24) so B's
nexthop cannot be resolved by ARP. Resolve A's neighbour for 10.10.0.2 as
permanent and attach a cls_bpf egress program to A, with vb the index of B:
struct bpf_redir_neigh nh = { .nh_family = AF_INET,
.ipv4_nh = htonl(0x0a010002) };
return bpf_redirect_neigh(vb, &nh, sizeof(nh), 0);
Send one packet to 10.10.0.2. It is parked on B's incomplete neighbour
for 10.1.0.2; once that neighbour becomes valid the frame leaves B
carrying A's source address and A's neighbour as the destination.
Reported-by: Sashiko (nipa) <sashiko-bot@kernel.org>
Closes: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/QDISC-6HS9.v3.r0.20261103062649-2@mojatatu.com
Link: https://lore.kernel.org/netdev/QDISC-6HS9.v3.r0.20261103062649-2@mojatatu.com/ (local)
Link: https://lore.kernel.org/netdev/avTfQjFQYR2NNdRg@chamomile/ (local)
Reviewed-by: Victor Nogueira <redacted>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
v3 -> v4 (commit-log change only; the diff is unchanged from v3):
- Add the section on what the target device's transmit path still sees
once the route is released: the NBMA tunnel drop with its
transmit-error count, the realm readers that stop matching, and the
encapsulation parameters that are preserved.
- Note that the skb_rtable() cast in ip_tunnel_xmit() and ip6_tnl_xmit()
is older than this series and is repaired separately. Considered
comments from Sashiko (nipa).
net/core/filter.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/core/filter.c b/net/core/filter.c
index bd98d29ed7f8..ae5346d6abd2 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2318,6 +2318,8 @@ static int __bpf_redirect_neigh_v6(struct sk_buff *skb, struct net_device *dev,
skb_dst_set(skb, dst);
} else if (nh->nh_family != AF_INET6) {
goto out_drop;
+ } else if (!skb_dst_drop_keep_metadata(skb)) {
+ goto out_drop;
}
err = bpf_out_neigh_v6(net, skb, dev, nh);@@ -2433,6 +2435,8 @@ static int __bpf_redirect_neigh_v4(struct sk_buff *skb, struct net_device *dev,
skb_dst_drop(skb);
skb_dst_set(skb, &rt->dst);
+ } else if (!skb_dst_drop_keep_metadata(skb)) {
+ goto out_drop;
}
err = bpf_out_neigh_v4(net, skb, dev, nh);--
2.43.0