Skip to content

Commit 241422d

Browse files
net: skbuff: propagate shared-frag marker through frag-transfer helpers
cve CVE-2026-46300 commit-author Hyunwoo Kim <imv4bel@gmail.com> commit - commit-source https://lore.kernel.org/all/agW4vC0r8QOUKtRT@v4bel/ upstream-diff | The upstream v3 patch does not apply cleanly to 5.14 due to two code reorganization differences: 1. skb_gro_receive_list() is in net/ipv4/udp_offload.c on 5.14, but was moved to net/core/gro.c in later kernels. The fix was applied to udp_offload.c instead. 2. skb_shift() in net/core/skbuff.c uses manual skb->len/data_len adjustments on 5.14, whereas upstream uses skb_len_add(). The surrounding context differs, causing the hunk to fail. The fix was applied at the equivalent location. The actual code changes are identical to upstream. Three frag-transfer helpers (__pskb_copy_fclone(), skb_try_coalesce(), and skb_shift()) fail to propagate the SKBFL_SHARED_FRAG bit in skb_shinfo()->flags when moving frags from source to destination. __pskb_copy_fclone() defers the rest of the shinfo metadata to skb_copy_header() after copying frag descriptors, but that helper only carries over gso_{size,segs,type} and never touches skb_shinfo()->flags; skb_try_coalesce() and skb_shift() move frag descriptors directly and leave flags untouched. As a result, the destination skb keeps a reference to the same externally-owned or page-cache-backed pages while reporting skb_has_shared_frag() as false. The mismatch is harmful in any in-place writer that uses skb_has_shared_frag() to decide whether shared pages must be detoured through skb_cow_data(). ESP input is one such writer (esp4.c, esp6.c), and a single nft 'dup to <local>' rule -- or any other nf_dup_ipv4() / xt_TEE caller -- is enough to land a pskb_copy()'d skb in esp_input() with the marker stripped, letting an unprivileged user write into the page cache of a root-owned read-only file via authencesn-ESN stray writes. Set SKBFL_SHARED_FRAG on the destination whenever frag descriptors were actually moved from the source. skb_copy() and skb_copy_expand() share skb_copy_header() too but linearize all paged data into freshly allocated head storage and emerge with nr_frags == 0, so skb_has_shared_frag() returns false on its own; they need no change. The same omission exists in skb_gro_receive() and skb_gro_receive_list(). The former moves the incoming skb's frag descriptors into the accumulator's last sub-skb via two paths (a direct frag-move loop and the head_frag + memcpy path); the latter chains the incoming skb whole onto p's frag_list. Downstream skb_segment() reads only skb_shinfo(p)->flags, and skb_segment_list() reuses each sub-skb's shinfo as the nskb -- both p and lp must carry the marker. Fixes: cef401d ("net: fix possible wrong checksum generation") Fixes: f4c50a4 ("xfrm: esp: avoid in-place decrypt on shared skb frags") Reported-by: William Bowling <vakzz@zellic.io> Reported-by: Hyunwoo Kim <imv4bel@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Hyunwoo Kim <imv4bel@gmail.com>
1 parent 4b5e38b commit 241422d

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

net/core/gro.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,12 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
222222
p->data_len += len;
223223
p->truesize += delta_truesize;
224224
p->len += len;
225+
skb_shinfo(p)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG;
225226
if (lp != p) {
226227
lp->data_len += len;
227228
lp->truesize += delta_truesize;
228229
lp->len += len;
230+
skb_shinfo(lp)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG;
229231
}
230232
NAPI_GRO_CB(skb)->same_flow = 1;
231233
return 0;

net/core/skbuff.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2026,6 +2026,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom,
20262026
skb_frag_ref(skb, i);
20272027
}
20282028
skb_shinfo(n)->nr_frags = i;
2029+
skb_shinfo(n)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
20292030
}
20302031

20312032
if (skb_has_frag_list(skb)) {
@@ -4028,6 +4029,8 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)
40284029
tgt->ip_summed = CHECKSUM_PARTIAL;
40294030
skb->ip_summed = CHECKSUM_PARTIAL;
40304031

4032+
skb_shinfo(tgt)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
4033+
40314034
/* Yak, is it really working this way? Some helper please? */
40324035
skb->len -= shiftlen;
40334036
skb->data_len -= shiftlen;
@@ -5740,6 +5743,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
57405743
from_shinfo->frags,
57415744
from_shinfo->nr_frags * sizeof(skb_frag_t));
57425745
to_shinfo->nr_frags += from_shinfo->nr_frags;
5746+
if (from_shinfo->nr_frags)
5747+
to_shinfo->flags |= from_shinfo->flags & SKBFL_SHARED_FRAG;
57435748

57445749
if (!skb_cloned(from))
57455750
from_shinfo->nr_frags = 0;

net/ipv4/udp_offload.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,8 @@ static int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)
487487
p->truesize += skb->truesize;
488488
p->len += skb->len;
489489

490+
skb_shinfo(p)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
491+
490492
NAPI_GRO_CB(skb)->same_flow = 1;
491493

492494
return 0;

0 commit comments

Comments
 (0)