FAILED: patch "[PATCH] bpf: Reject fragmented frames in devmap" failed to apply to 5.15-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x aa496720618f1a6054f1c870bf10b4f6c99bf656
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071421-video-bucket-8e49@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From aa496720618f1a6054f1c870bf10b4f6c99bf656 Mon Sep 17 00:00:00 2001
From: Zhao Zhang <[email protected]>
Date: Tue, 2 Jun 2026 16:43:33 +0800
Subject: [PATCH] bpf: Reject fragmented frames in devmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Devmap broadcast redirects clone the packet for all but the last destination.
For native XDP, that clone path copies only the linear xdp_frame data, while fragmented frames keep skb_shared_info in tailroom outside the linear area. Cloning such a frame leaves XDP_FLAGS_HAS_FRAGS set but without valid frag metadata, and the later free path can interpret uninitialized tail data as skb_shared_info, leading to an out-of-bounds access during frame return.
Reject fragmented native XDP frames in dev_map_enqueue_clone().
Add the same restriction to the generic XDP clone path in dev_map_redirect_clone(). Generic XDP represents fragmented packets as nonlinear skbs, and rejecting them here keeps clone-based broadcast support aligned between native and generic XDP.
kernel/bpf/devmap.c +7 -0
@@ -581,6 +581,10 @@ static int dev_map_enqueue_clone(struct bpf_dtab_netdev *obj, {struct xdp_frame *nxdpf; +/* Frags live outside the linear frame and cannot be cloned safely. */ +if (unlikely (xdp_frame_has_frags (xdpf))) +return -EOPNOTSUPP ; + nxdpf =xdpf_clone (xdpf);if (!nxdpf)return -ENOMEM ;
@@ -726,6 +730,9 @@ static int dev_map_redirect_clone(struct bpf_dtab_netdev *dst,struct sk_buff *nskb;int err; +if (unlikely (skb_is_nonlinear (skb))) +return -EOPNOTSUPP ; + nskb =skb_clone (skb,GFP_ATOMIC );if (!nskb)return -ENOMEM ;
Sasha Levin
maintainerPATCH 1/2 xdp: introduce flags field in xdp_buff/xdp_frame
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit 2e88d4ff03013937028f5397268b21e10cf68713 ]
Introduce flags field in xdp_frame and xdp_buffer data structures to define additional buffer features. At the moment the only supported buffer feature is frags bit (XDP_FLAGS_HAS_FRAGS). frags bit is used to specify if this is a linear buffer (XDP_FLAGS_HAS_FRAGS not set) or a frags frame (XDP_FLAGS_HAS_FRAGS set). In the latter case the driver is expected to initialize the skb_shared_info structure at the end of the first buffer to link together subsequent buffers belonging to the same frame.
Stable-dep-of: aa496720618f ("bpf: Reject fragmented frames in devmap")
--- include/net/xdp.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
include/net/xdp.h +29 -0
@@ -66,6 +66,10 @@ struct xdp_txq_info {struct net_device *dev; }; +enum xdp_buff_flags { +XDP_FLAGS_HAS_FRAGS =BIT (0 ),/* non-linear xdp buff */ +}; +struct xdp_buff {void *data;void *data_end;
@@ -74,13 +78,30 @@ struct xdp_buff {struct xdp_rxq_info *rxq;struct xdp_txq_info *txq;u32 frame_sz;/* frame size to deduce data_hard_end/reserved tailroom*/ +u32 flags;/* supported values defined in xdp_buff_flags */ }; +static __always_inline bool xdp_buff_has_frags(struct xdp_buff *xdp) +{ +return !!(xdp->flags &XDP_FLAGS_HAS_FRAGS ); +} + +static __always_inline void xdp_buff_set_frags_flag(struct xdp_buff *xdp) +{ + xdp->flags |=XDP_FLAGS_HAS_FRAGS ; +} + +static __always_inline void xdp_buff_clear_frags_flag(struct xdp_buff *xdp) +{ + xdp->flags &= ~XDP_FLAGS_HAS_FRAGS ; +} + static __always_inline voidxdp_init_buff (struct xdp_buff *xdp,u32 frame_sz,struct xdp_rxq_info *rxq) { xdp->frame_sz = frame_sz; xdp->rxq = rxq; + xdp->flags =0 ; }static __always_inline void
@@ -122,8 +143,14 @@ struct xdp_frame {*/ struct xdp_mem_info mem;struct net_device *dev_rx;/* used by cpumap */ +u32 flags;/* supported values defined in xdp_buff_flags */ }; +static __always_inline bool xdp_frame_has_frags(struct xdp_frame *frame) +{ +return !!(frame->flags &XDP_FLAGS_HAS_FRAGS ); +} +#define XDP_BULK_QUEUE_SIZE 16struct xdp_frame_bulk {int count;
@@ -180,6 +207,7 @@ void xdp_convert_frame_to_buff(struct xdp_frame *frame, struct xdp_buff *xdp) xdp->data_end = frame->data + frame->len; xdp->data_meta = frame->data - frame->metasize; xdp->frame_sz = frame->frame_sz; + xdp->flags = frame->flags; } static inline
@@ -206,6 +234,7 @@ int xdp_update_frame_from_buff(struct xdp_buff *xdp, xdp_frame->headroom = headroom -sizeof (*xdp_frame); xdp_frame->metasize = metasize; xdp_frame->frame_sz = xdp->frame_sz; + xdp_frame->flags = xdp->flags;return 0 ; }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 bpf: Reject fragmented frames in devmap
From: Zhao Zhang <[email protected]>
[ Upstream commit aa496720618f1a6054f1c870bf10b4f6c99bf656 ]
Devmap broadcast redirects clone the packet for all but the last destination.
For native XDP, that clone path copies only the linear xdp_frame data, while fragmented frames keep skb_shared_info in tailroom outside the linear area. Cloning such a frame leaves XDP_FLAGS_HAS_FRAGS set but without valid frag metadata, and the later free path can interpret uninitialized tail data as skb_shared_info, leading to an out-of-bounds access during frame return.
Reject fragmented native XDP frames in dev_map_enqueue_clone().
Add the same restriction to the generic XDP clone path in dev_map_redirect_clone(). Generic XDP represents fragmented packets as nonlinear skbs, and rejecting them here keeps clone-based broadcast support aligned between native and generic XDP.
--- kernel/bpf/devmap.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/bpf/devmap.c +7 -0
@@ -551,6 +551,10 @@ static int dev_map_enqueue_clone(struct bpf_dtab_netdev *obj, {struct xdp_frame *nxdpf; +/* Frags live outside the linear frame and cannot be cloned safely. */ +if (unlikely (xdp_frame_has_frags (xdpf))) +return -EOPNOTSUPP ; + nxdpf =xdpf_clone (xdpf);if (!nxdpf)return -ENOMEM ;
@@ -696,6 +700,9 @@ static int dev_map_redirect_clone(struct bpf_dtab_netdev *dst,struct sk_buff *nskb;int err; +if (unlikely (skb_is_nonlinear (skb))) +return -EOPNOTSUPP ; + nskb =skb_clone (skb,GFP_ATOMIC );if (!nskb)return -ENOMEM ;
Signature · 1 line
2.53.0