]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
bpf: Run generic devmap egress prog on private skb
authorSun Jian <sun.jian.kdev@gmail.com>
Fri, 12 Jun 2026 11:40:31 +0000 (19:40 +0800)
committerAlexei Starovoitov <ast@kernel.org>
Sat, 13 Jun 2026 01:21:01 +0000 (18:21 -0700)
Generic XDP devmap multi redirect uses skb_clone() for intermediate
destinations and sends the last destination with the original skb. This
can leave multiple destinations sharing the same packet data.

This becomes visible after generic devmap egress-program support was
added: a devmap egress program may mutate packet data, and another
destination sharing the same data can observe that mutation.

Native XDP broadcast redirect does not have this issue because
xdpf_clone() copies the frame data for each destination. Generic XDP
should provide the same per-destination isolation before running a
devmap egress program.

Fix this by making cloned skbs private before running the generic devmap
egress program. Use skb_copy() instead of skb_unshare() so allocation
failure does not consume the skb and the existing caller error paths keep
their ownership semantics.

Fixes: 2ea5eabaf04a ("bpf: devmap: Implement devmap prog execution for generic XDP")
Suggested-by: Jiayuan Chen <jiayuan.chen@linux.dev>
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Sun Jian <sun.jian.kdev@gmail.com>
Link: https://lore.kernel.org/r/20260612114032.244616-2-sun.jian.kdev@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/devmap.c

index 5b9eac5342a90d348c568db6803313288fe748b4..dc7b859e8bbfdaab8a7deaa30cfdee444ab54072 100644 (file)
@@ -710,6 +710,18 @@ int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb,
        if (unlikely(err))
                return err;
 
+       if (dst->xdp_prog && skb_cloned(skb)) {
+               struct sk_buff *nskb;
+
+               nskb = skb_copy(skb, GFP_ATOMIC);
+               if (!nskb)
+                       return -ENOMEM;
+
+               nskb->mac_len = skb->mac_len;
+               consume_skb(skb);
+               skb = nskb;
+       }
+
        /* Redirect has already succeeded semantically at this point, so we just
         * return 0 even if packet is dropped. Helper below takes care of
         * freeing skb.