diff --git a/1101-rxrpc-linearize-paged-frags.patch b/1101-rxrpc-linearize-paged-frags.patch new file mode 100644 index 000000000..c57902b48 --- /dev/null +++ b/1101-rxrpc-linearize-paged-frags.patch @@ -0,0 +1,68 @@ +From: Andrew Lukoshko +Subject: [PATCH AlmaLinux 10] rxrpc: linearize incoming DATA packet when it has paged frags + +AlmaLinux-specific backport of the intent of the upstream rxrpc fix +posted at https://lore.kernel.org/all/afKV2zGR6rrelPC7@v4bel/ +(sibling to upstream commit f4c50a4034e6 in the ESP/xfrm subsystem). + +The upstream patch can not be cherry-picked against this 6.12 tree: +its target lines were introduced by upstream commit d0d5c0cd1e71 +("rxrpc: Use skb_unshare() rather than skb_cow_data()") which is not +present here. The age-equivalent code path on AlmaLinux 10 is the +centralized skb_unshare() in net/rxrpc/io_thread.c that is run for +every DATA packet with a non-zero securityIndex before in-place +decryption. + +skb_unshare() only handles cloned skbs. An skb that is non-cloned but +carries paged fragments (skb->data_len != 0) — e.g. pages attached via +udp_sendpage() / splice() / MSG_SPLICE_PAGES on a UDP socket carrying +rxrpc traffic — slips through and is decrypted in place over data the +skb does not own privately. With kernel-modules-partner installed +(rxrpc.ko enabled), this is exploitable. + +Replace the unconditional skb_unshare() with skb_copy() whenever the +skb is cloned OR carries paged fragments. skb_copy() always returns a +freshly allocated linear skb, so subsequent in-place decryption only +touches kernel-owned memory. The original skb is consumed explicitly +(skb_unshare did this internally via consume_skb()). + +Verified to apply with `patch -p1 -F0` (no offset, no fuzz, no +rejects) against kernel-6.12.0-124.55.1.el10_1. + +Fixes: cac2661c53f3 ("rxrpc: Use skb_cow_data() in rxrpc_recvmsg_data()") +Signed-off-by: Andrew Lukoshko +--- + net/rxrpc/io_thread.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +--- a/net/rxrpc/io_thread.c ++++ b/net/rxrpc/io_thread.c +@@ -235,16 +235,18 @@ + * decryption. + */ + if (sp->hdr.securityIndex != 0) { +- skb = skb_unshare(skb, GFP_ATOMIC); +- if (!skb) { +- rxrpc_eaten_skb(*_skb, rxrpc_skb_eaten_by_unshare_nomem); +- *_skb = NULL; +- return just_discard; +- } ++ if (skb_cloned(skb) || skb->data_len) { ++ struct sk_buff *nskb = skb_copy(skb, GFP_ATOMIC); ++ ++ if (!nskb) { ++ rxrpc_eaten_skb(*_skb, rxrpc_skb_eaten_by_unshare_nomem); ++ return just_discard; ++ } + +- if (skb != *_skb) { + rxrpc_eaten_skb(*_skb, rxrpc_skb_eaten_by_unshare); +- *_skb = skb; ++ consume_skb(*_skb); ++ *_skb = nskb; ++ skb = nskb; + rxrpc_new_skb(skb, rxrpc_skb_new_unshared); + sp = rxrpc_skb(skb); + } +-- +2.43.0 diff --git a/kernel.spec b/kernel.spec index bbf58194a..3a7611a60 100644 --- a/kernel.spec +++ b/kernel.spec @@ -176,13 +176,13 @@ Summary: The Linux kernel %define specrpmversion 6.12.0 %define specversion 6.12.0 %define patchversion 6.12 -%define pkgrelease 124.55.2 +%define pkgrelease 124.55.3 %define kversion 6 %define tarfile_release 6.12.0-124.55.1.el10_1 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 124.55.2%{?buildid}%{?dist} +%define specrelease 124.55.3%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.12.0-124.55.1.el10_1 @@ -1129,6 +1129,7 @@ Patch2008: 0008-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch Patch2009: 0009-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch Patch2010: 0010-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch Patch1100: 1100-xfrm-esp-avoid-in-place-decrypt-shared-skb-frags.patch +Patch1101: 1101-rxrpc-linearize-paged-frags.patch # END OF PATCH DEFINITIONS @@ -1991,6 +1992,7 @@ ApplyPatch 0008-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch ApplyPatch 0009-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch ApplyPatch 0010-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch ApplyPatch 1100-xfrm-esp-avoid-in-place-decrypt-shared-skb-frags.patch +ApplyPatch 1101-rxrpc-linearize-paged-frags.patch %{log_msg "End of patch applications"} # END OF PATCH APPLICATIONS @@ -4379,6 +4381,9 @@ fi\ # # %changelog +* Thu May 07 2026 Andrew Lukoshko - 6.12.0-124.55.3 +- rxrpc: linearize incoming DATA packet when it has paged frags + * Thu May 07 2026 Andrew Lukoshko - 6.12.0-124.55.2 - xfrm: esp: avoid in-place decrypt on shared skb frags