Skip to content

Commit cc78744

Browse files
committed
net: skbuff: propagate shared-frag marker through frag-transfer helpers
jira VULN-185344 cve CVE-2026-46300 commit-author Hyunwoo Kim <imv4bel@gmail.com> commit - commit-source https://lore.kernel.org/all/agToIEDI4TaTNLRb@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. 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: Jonathan Maple <jmaple@ciq.com>
1 parent 14b2e29 commit cc78744

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

net/core/skbuff.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1594,6 +1594,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom,
15941594
skb_frag_ref(skb, i);
15951595
}
15961596
skb_shinfo(n)->nr_frags = i;
1597+
skb_shinfo(n)->tx_flags |= skb_shinfo(skb)->tx_flags & SKBTX_SHARED_FRAG;
15971598
}
15981599

15991600
if (skb_has_frag_list(skb)) {
@@ -3425,6 +3426,8 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)
34253426
tgt->ip_summed = CHECKSUM_PARTIAL;
34263427
skb->ip_summed = CHECKSUM_PARTIAL;
34273428

3429+
skb_shinfo(tgt)->tx_flags |= skb_shinfo(skb)->tx_flags & SKBTX_SHARED_FRAG;
3430+
34283431
/* Yak, is it really working this way? Some helper please? */
34293432
skb->len -= shiftlen;
34303433
skb->data_len -= shiftlen;
@@ -5298,6 +5301,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
52985301
from_shinfo->frags,
52995302
from_shinfo->nr_frags * sizeof(skb_frag_t));
53005303
to_shinfo->nr_frags += from_shinfo->nr_frags;
5304+
if (from_shinfo->nr_frags)
5305+
to_shinfo->tx_flags |= from_shinfo->tx_flags & SKBTX_SHARED_FRAG;
53015306

53025307
if (!skb_cloned(from))
53035308
from_shinfo->nr_frags = 0;

0 commit comments

Comments
 (0)