]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.1-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 May 2026 14:50:44 +0000 (16:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 May 2026 14:50:44 +0000 (16:50 +0200)
added patches:
0001-xfrm-esp-ipv4-fix-up-flags-setting.patch
series

queue-6.1/0001-xfrm-esp-ipv4-fix-up-flags-setting.patch [new file with mode: 0644]
queue-6.1/series [new file with mode: 0644]

diff --git a/queue-6.1/0001-xfrm-esp-ipv4-fix-up-flags-setting.patch b/queue-6.1/0001-xfrm-esp-ipv4-fix-up-flags-setting.patch
new file mode 100644 (file)
index 0000000..a6141f6
--- /dev/null
@@ -0,0 +1,30 @@
+From fe785bb3a8096dffcc4048a85cd0c83337eeecad Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 8 May 2026 16:26:10 +0200
+Subject: xfrm: esp: ipv4: fix up flags setting
+
+In commit 5d55c7336f80 ("xfrm: esp: avoid in-place decrypt on shared skb
+frags") in the 6.1.y tree, the tx_flags variable was set, instead of
+flags.
+
+Link: https://lore.kernel.org/r/1b941a1353791ddd6fd75fb8e68b377367d689ff.camel@oracle.com
+Reported-by: Dominik Grzegorzek <dominik.grzegorzek@oracle.com>
+Reported-by: Massimiliano Pellizzer <mpellizzer.dev@gmail.com>
+Cc: Ben Hutchings <benh@debian.org>
+Fixes: ab8b995323e5 ("xfrm: esp: avoid in-place decrypt on shared skb frags")
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/ipv4/ip_output.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/ipv4/ip_output.c
++++ b/net/ipv4/ip_output.c
+@@ -1463,7 +1463,7 @@ ssize_t  ip_append_page(struct sock *sk,
+                       goto error;
+               }
+-              skb_shinfo(skb)->tx_flags |= SKBFL_SHARED_FRAG;
++              skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
+               if (skb->ip_summed == CHECKSUM_NONE) {
+                       __wsum csum;
diff --git a/queue-6.1/series b/queue-6.1/series
new file mode 100644 (file)
index 0000000..cef6d39
--- /dev/null
@@ -0,0 +1 @@
+0001-xfrm-esp-ipv4-fix-up-flags-setting.patch