Andrew Lukoshko
6a2023aeef
The Debrand commit on top of the kernel-6.12.0-228.el10 import wiped
out our four local patches. Restore them verbatim from the parent
(bc942b9e7):
1100-xfrm-esp-avoid-in-place-decrypt-shared-skb-frags.patch (CVE-2026-43284)
1101-rxrpc-linearize-paged-frags.patch (CVE-2026-43500)
1102-net-skbuff-propagate-shared-frag-marker.patch
1103-ptrace-require-cap-on-mm-less-task.patch
Patch declarations, ApplyPatch entries and a changelog stanza added
under the existing 6.12.0-228 version; release is not bumped.
106 lines
4.1 KiB
Diff
106 lines
4.1 KiB
Diff
From: Eduard Abdullin <eabdullin@almalinux.org>
|
|
Subject: [PATCH AlmaLinux 10] net: skbuff: propagate shared-frag marker through frag-transfer helpers
|
|
|
|
Backport of upstream v3 patch posted at
|
|
https://lore.kernel.org/all/agW4vC0r8QOUKtRT@v4bel/
|
|
(sibling to upstream commit f4c50a4034e6 "xfrm: esp: avoid in-place
|
|
decrypt on shared skb frags").
|
|
|
|
Three frag-transfer helpers (__pskb_copy_fclone(), skb_try_coalesce(),
|
|
and skb_shift()) and the GRO accumulator helpers (skb_gro_receive()
|
|
and skb_gro_receive_list()) fail to propagate the SKBFL_SHARED_FRAG
|
|
bit in skb_shinfo()->flags when moving frag descriptors from source
|
|
to destination. 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). Combined with an nft 'dup to <local>' rule, an
|
|
nf_dup_ipv4() / xt_TEE caller, or ESP-over-UDP with UDP GRO, this
|
|
lets an unprivileged user write into the page cache of a root-owned
|
|
read-only file via authencesn-ESN stray writes (CVE-2026-46300,
|
|
"Fragnesia").
|
|
|
|
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 plus a
|
|
"merge:" fallback that chains the whole skb onto frag_list; 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: cef401de7be8 ("net: fix possible wrong checksum generation")
|
|
Fixes: f4c50a4034e6 ("xfrm: esp: avoid in-place decrypt on shared skb frags")
|
|
Reported-by: Sultan Alsawaf <sultan@kerneltoast.com>
|
|
Reported-by: William Bowling <vakzz@zellic.io>
|
|
Reported-by: Hyunwoo Kim <imv4bel@gmail.com>
|
|
Signed-off-by: Eduard Abdullin <eabdullin@almalinux.org>
|
|
---
|
|
net/core/gro.c | 4 ++++
|
|
net/core/skbuff.c | 5 +++++
|
|
2 files changed, 9 insertions(+)
|
|
|
|
--- a/net/core/gro.c
|
|
+++ b/net/core/gro.c
|
|
@@ -213,10 +213,12 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
|
|
p->data_len += len;
|
|
p->truesize += delta_truesize;
|
|
p->len += len;
|
|
+ skb_shinfo(p)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG;
|
|
if (lp != p) {
|
|
lp->data_len += len;
|
|
lp->truesize += delta_truesize;
|
|
lp->len += len;
|
|
+ skb_shinfo(lp)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG;
|
|
}
|
|
NAPI_GRO_CB(skb)->same_flow = 1;
|
|
return 0;
|
|
@@ -244,6 +246,8 @@ int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)
|
|
p->truesize += skb->truesize;
|
|
p->len += skb->len;
|
|
|
|
+ skb_shinfo(p)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
|
|
+
|
|
NAPI_GRO_CB(skb)->same_flow = 1;
|
|
|
|
return 0;
|
|
--- a/net/core/skbuff.c
|
|
+++ b/net/core/skbuff.c
|
|
@@ -2123,6 +2123,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom,
|
|
skb_frag_ref(skb, i);
|
|
}
|
|
skb_shinfo(n)->nr_frags = i;
|
|
+ skb_shinfo(n)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
|
|
}
|
|
|
|
if (skb_has_frag_list(skb)) {
|
|
@@ -4198,6 +4199,8 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)
|
|
tgt->ip_summed = CHECKSUM_PARTIAL;
|
|
skb->ip_summed = CHECKSUM_PARTIAL;
|
|
|
|
+ skb_shinfo(tgt)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
|
|
+
|
|
skb_len_add(skb, -shiftlen);
|
|
skb_len_add(tgt, shiftlen);
|
|
|
|
@@ -6028,6 +6031,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
|
|
from_shinfo->frags,
|
|
from_shinfo->nr_frags * sizeof(skb_frag_t));
|
|
to_shinfo->nr_frags += from_shinfo->nr_frags;
|
|
+ if (from_shinfo->nr_frags)
|
|
+ to_shinfo->flags |= from_shinfo->flags & SKBFL_SHARED_FRAG;
|
|
|
|
if (!skb_cloned(from))
|
|
from_shinfo->nr_frags = 0;
|
|
--
|
|
2.43.0
|