Skip to content

Commit f0cd579

Browse files
bmastbergengithub-actions[bot]
authored andcommitted
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/ 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> Signed-off-by: Brett Mastbergen <bmastbergen@ciq.com>
1 parent 689d6c3 commit f0cd579

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

net/core/gro.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,12 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
215215
p->data_len += len;
216216
p->truesize += delta_truesize;
217217
p->len += len;
218+
skb_shinfo(p)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG;
218219
if (lp != p) {
219220
lp->data_len += len;
220221
lp->truesize += delta_truesize;
221222
lp->len += len;
223+
skb_shinfo(lp)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG;
222224
}
223225
NAPI_GRO_CB(skb)->same_flow = 1;
224226
return 0;
@@ -246,6 +248,8 @@ int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)
246248
p->truesize += skb->truesize;
247249
p->len += skb->len;
248250

251+
skb_shinfo(p)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
252+
249253
NAPI_GRO_CB(skb)->same_flow = 1;
250254

251255
return 0;

net/core/skbuff.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2188,6 +2188,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom,
21882188
skb_frag_ref(skb, i);
21892189
}
21902190
skb_shinfo(n)->nr_frags = i;
2191+
skb_shinfo(n)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
21912192
}
21922193

21932194
if (skb_has_frag_list(skb)) {
@@ -4301,6 +4302,8 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)
43014302
tgt->ip_summed = CHECKSUM_PARTIAL;
43024303
skb->ip_summed = CHECKSUM_PARTIAL;
43034304

4305+
skb_shinfo(tgt)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
4306+
43044307
skb_len_add(skb, -shiftlen);
43054308
skb_len_add(tgt, shiftlen);
43064309

@@ -6149,6 +6152,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
61496152
from_shinfo->frags,
61506153
from_shinfo->nr_frags * sizeof(skb_frag_t));
61516154
to_shinfo->nr_frags += from_shinfo->nr_frags;
6155+
if (from_shinfo->nr_frags)
6156+
to_shinfo->flags |= from_shinfo->flags & SKBFL_SHARED_FRAG;
61526157

61536158
if (!skb_cloned(from))
61546159
from_shinfo->nr_frags = 0;

0 commit comments

Comments
 (0)