From b91a8a4ac404414e7f775f74d27a3b88d778a4a8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 11 May 2026 08:31:08 +0200 Subject: [PATCH] drop rxrpc patch already applied Signed-off-by: Greg Kroah-Hartman --- ...packets-when-paged-frags-are-present.patch | 61 ------------------- queue-6.18/series | 1 - ...packets-when-paged-frags-are-present.patch | 61 ------------------- queue-7.0/series | 1 - 4 files changed, 124 deletions(-) delete mode 100644 queue-6.18/rxrpc-also-unshare-data-response-packets-when-paged-frags-are-present.patch delete mode 100644 queue-7.0/rxrpc-also-unshare-data-response-packets-when-paged-frags-are-present.patch diff --git a/queue-6.18/rxrpc-also-unshare-data-response-packets-when-paged-frags-are-present.patch b/queue-6.18/rxrpc-also-unshare-data-response-packets-when-paged-frags-are-present.patch deleted file mode 100644 index af4c6050f0..0000000000 --- a/queue-6.18/rxrpc-also-unshare-data-response-packets-when-paged-frags-are-present.patch +++ /dev/null @@ -1,61 +0,0 @@ -From aa54b1d27fe0c2b78e664a34fd0fdf7cd1960d71 Mon Sep 17 00:00:00 2001 -From: Hyunwoo Kim -Date: Fri, 8 May 2026 17:53:09 +0900 -Subject: rxrpc: Also unshare DATA/RESPONSE packets when paged frags are present - -From: Hyunwoo Kim - -commit aa54b1d27fe0c2b78e664a34fd0fdf7cd1960d71 upstream. - -The DATA-packet handler in rxrpc_input_call_event() and the RESPONSE -handler in rxrpc_verify_response() copy the skb to a linear one before -calling into the security ops only when skb_cloned() is true. An skb -that is not cloned but still carries externally-owned paged fragments -(e.g. SKBFL_SHARED_FRAG set by splice() into a UDP socket via -__ip_append_data, or a chained skb_has_frag_list()) falls through to -the in-place decryption path, which binds the frag pages directly into -the AEAD/skcipher SGL via skb_to_sgvec(). - -Extend the gate to also unshare when skb_has_frag_list() or -skb_has_shared_frag() is true. This catches the splice-loopback vector -and other externally-shared frag sources while preserving the -zero-copy fast path for skbs whose frags are kernel-private (e.g. NIC -page_pool RX, GRO). The OOM/trace handling already in place is reused. - -Fixes: d0d5c0cd1e71 ("rxrpc: Use skb_unshare() rather than skb_cow_data()") -Cc: stable@vger.kernel.org -Signed-off-by: Hyunwoo Kim -Reviewed-by: Jiayuan Chen -Acked-by: David Howells -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman ---- - net/rxrpc/call_event.c | 4 +++- - net/rxrpc/conn_event.c | 3 ++- - 2 files changed, 5 insertions(+), 2 deletions(-) - ---- a/net/rxrpc/call_event.c -+++ b/net/rxrpc/call_event.c -@@ -334,7 +334,9 @@ bool rxrpc_input_call_event(struct rxrpc - - if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA && - sp->hdr.securityIndex != 0 && -- skb_cloned(skb)) { -+ (skb_cloned(skb) || -+ skb_has_frag_list(skb) || -+ skb_has_shared_frag(skb))) { - /* Unshare the packet so that it can be - * modified by in-place decryption. - */ ---- a/net/rxrpc/conn_event.c -+++ b/net/rxrpc/conn_event.c -@@ -245,7 +245,8 @@ static int rxrpc_verify_response(struct - { - int ret; - -- if (skb_cloned(skb)) { -+ if (skb_cloned(skb) || skb_has_frag_list(skb) || -+ skb_has_shared_frag(skb)) { - /* Copy the packet if shared so that we can do in-place - * decryption. - */ diff --git a/queue-6.18/series b/queue-6.18/series index c0a6b82378..f0229e7394 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -19,4 +19,3 @@ flow_dissector-do-not-dissect-pppoe-pfc-frames.patch mptcp-sync-the-msk-sndbuf-at-accept-time.patch smb-client-smbdirect-fix-mr-registration-for-coalesc.patch net-af_key-zero-aligned-sockaddr-tail-in-pf_key-expo.patch -rxrpc-also-unshare-data-response-packets-when-paged-frags-are-present.patch diff --git a/queue-7.0/rxrpc-also-unshare-data-response-packets-when-paged-frags-are-present.patch b/queue-7.0/rxrpc-also-unshare-data-response-packets-when-paged-frags-are-present.patch deleted file mode 100644 index af4c6050f0..0000000000 --- a/queue-7.0/rxrpc-also-unshare-data-response-packets-when-paged-frags-are-present.patch +++ /dev/null @@ -1,61 +0,0 @@ -From aa54b1d27fe0c2b78e664a34fd0fdf7cd1960d71 Mon Sep 17 00:00:00 2001 -From: Hyunwoo Kim -Date: Fri, 8 May 2026 17:53:09 +0900 -Subject: rxrpc: Also unshare DATA/RESPONSE packets when paged frags are present - -From: Hyunwoo Kim - -commit aa54b1d27fe0c2b78e664a34fd0fdf7cd1960d71 upstream. - -The DATA-packet handler in rxrpc_input_call_event() and the RESPONSE -handler in rxrpc_verify_response() copy the skb to a linear one before -calling into the security ops only when skb_cloned() is true. An skb -that is not cloned but still carries externally-owned paged fragments -(e.g. SKBFL_SHARED_FRAG set by splice() into a UDP socket via -__ip_append_data, or a chained skb_has_frag_list()) falls through to -the in-place decryption path, which binds the frag pages directly into -the AEAD/skcipher SGL via skb_to_sgvec(). - -Extend the gate to also unshare when skb_has_frag_list() or -skb_has_shared_frag() is true. This catches the splice-loopback vector -and other externally-shared frag sources while preserving the -zero-copy fast path for skbs whose frags are kernel-private (e.g. NIC -page_pool RX, GRO). The OOM/trace handling already in place is reused. - -Fixes: d0d5c0cd1e71 ("rxrpc: Use skb_unshare() rather than skb_cow_data()") -Cc: stable@vger.kernel.org -Signed-off-by: Hyunwoo Kim -Reviewed-by: Jiayuan Chen -Acked-by: David Howells -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman ---- - net/rxrpc/call_event.c | 4 +++- - net/rxrpc/conn_event.c | 3 ++- - 2 files changed, 5 insertions(+), 2 deletions(-) - ---- a/net/rxrpc/call_event.c -+++ b/net/rxrpc/call_event.c -@@ -334,7 +334,9 @@ bool rxrpc_input_call_event(struct rxrpc - - if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA && - sp->hdr.securityIndex != 0 && -- skb_cloned(skb)) { -+ (skb_cloned(skb) || -+ skb_has_frag_list(skb) || -+ skb_has_shared_frag(skb))) { - /* Unshare the packet so that it can be - * modified by in-place decryption. - */ ---- a/net/rxrpc/conn_event.c -+++ b/net/rxrpc/conn_event.c -@@ -245,7 +245,8 @@ static int rxrpc_verify_response(struct - { - int ret; - -- if (skb_cloned(skb)) { -+ if (skb_cloned(skb) || skb_has_frag_list(skb) || -+ skb_has_shared_frag(skb)) { - /* Copy the packet if shared so that we can do in-place - * decryption. - */ diff --git a/queue-7.0/series b/queue-7.0/series index f75c24fd35..f81696bd29 100644 --- a/queue-7.0/series +++ b/queue-7.0/series @@ -17,4 +17,3 @@ ksmbd-rewrite-stop_sessions-with-restartable-iteration.patch kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch flow_dissector-do-not-dissect-pppoe-pfc-frames.patch smb-client-smbdirect-fix-mr-registration-for-coalesc.patch -rxrpc-also-unshare-data-response-packets-when-paged-frags-are-present.patch -- 2.47.3