6.1-stable patches

added patches:
	net-tls-update-curr-on-splice-as-well.patch

diff --git a/queue-6.1/net-tls-update-curr-on-splice-as-well.patch b/queue-6.1/net-tls-update-curr-on-splice-as-well.patch
new file mode 100644 (file)
index 0000000..41852c3
--- /dev/null
+++ b/queue-6.1/net-tls-update-curr-on-splice-as-well.patch
@@ -0,0 +1,33 @@
+From c5a595000e2677e865a39f249c056bc05d6e55fd Mon Sep 17 00:00:00 2001
+From: John Fastabend <john.fastabend@gmail.com>
+Date: Wed, 6 Dec 2023 15:27:05 -0800
+Subject: net: tls, update curr on splice as well
+
+From: John Fastabend <john.fastabend@gmail.com>
+
+commit c5a595000e2677e865a39f249c056bc05d6e55fd upstream.
+
+The curr pointer must also be updated on the splice similar to how
+we do this for other copy types.
+
+Fixes: d829e9c4112b ("tls: convert to generic sk_msg interface")
+Signed-off-by: John Fastabend <john.fastabend@gmail.com>
+Reported-by: Jann Horn <jannh@google.com>
+Link: https://lore.kernel.org/r/20231206232706.374377-2-john.fastabend@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/tls/tls_sw.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/net/tls/tls_sw.c
++++ b/net/tls/tls_sw.c
+@@ -1225,6 +1225,8 @@ alloc_payload:
+               }
+ 
+               sk_msg_page_add(msg_pl, page, copy, offset);
++              msg_pl->sg.copybreak = 0;
++              msg_pl->sg.curr = msg_pl->sg.end;
+               sk_mem_charge(sk, copy);
+ 
+               offset += copy;

diff --git a/queue-6.1/series b/queue-6.1/series
index e4039758ed664d352821b5bd189b56299a040f87..c277868711f00e4f4fd2e43c5f339c8f4d2d2206 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -102,3 +102,4 @@ ring-buffer-fix-writing-to-the-buffer-with-max_data_size.patch
 ring-buffer-fix-a-race-in-rb_time_cmpxchg-for-32-bit-archs.patch
 ring-buffer-do-not-try-to-put-back-write_stamp.patch
 ring-buffer-have-rb_time_cmpxchg-set-the-msb-counter-too.patch
+net-tls-update-curr-on-splice-as-well.patch