Commit 2ba4a15
committed
net: skbuff: propagate shared-frag marker through frag-transfer helpers
jira VULN-185345
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 4.18 due to three
differences:
1. net/core/gro.c does not exist on 4.18. Both skb_gro_receive()
and skb_gro_receive_list() are in net/core/skbuff.c.
2. skb_shift() context differs — 4.18 uses manual skb->len/data_len
adjustments, upstream uses skb_len_add().
3. 4.18 uses the older tx_flags/SKBTX_SHARED_FRAG API instead of
the newer flags/SKBFL_SHARED_FRAG API introduced in later kernels.
The actual code changes are identical to upstream, adapted for the
4.18 API.
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 398708d commit 2ba4a15
1 file changed
Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1594 | 1594 | | |
1595 | 1595 | | |
1596 | 1596 | | |
| 1597 | + | |
1597 | 1598 | | |
1598 | 1599 | | |
1599 | 1600 | | |
| |||
3425 | 3426 | | |
3426 | 3427 | | |
3427 | 3428 | | |
| 3429 | + | |
| 3430 | + | |
3428 | 3431 | | |
3429 | 3432 | | |
3430 | 3433 | | |
| |||
3843 | 3846 | | |
3844 | 3847 | | |
3845 | 3848 | | |
| 3849 | + | |
| 3850 | + | |
3846 | 3851 | | |
3847 | 3852 | | |
3848 | 3853 | | |
| |||
4308 | 4313 | | |
4309 | 4314 | | |
4310 | 4315 | | |
| 4316 | + | |
4311 | 4317 | | |
4312 | 4318 | | |
4313 | 4319 | | |
4314 | 4320 | | |
| 4321 | + | |
4315 | 4322 | | |
4316 | 4323 | | |
4317 | 4324 | | |
| |||
5298 | 5305 | | |
5299 | 5306 | | |
5300 | 5307 | | |
| 5308 | + | |
| 5309 | + | |
5301 | 5310 | | |
5302 | 5311 | | |
5303 | 5312 | | |
| |||
0 commit comments