From: Greg Kroah-Hartman Date: Thu, 11 Jan 2024 09:58:26 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v5.10.207~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4855ff6ee622afaa4dece3db9b27dc3dea790e36;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: net-tls-update-curr-on-splice-as-well.patch --- diff --git a/queue-5.10/net-tls-update-curr-on-splice-as-well.patch b/queue-5.10/net-tls-update-curr-on-splice-as-well.patch new file mode 100644 index 00000000000..3bb139700f0 --- /dev/null +++ b/queue-5.10/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 +Date: Wed, 6 Dec 2023 15:27:05 -0800 +Subject: net: tls, update curr on splice as well + +From: John Fastabend + +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 +Reported-by: Jann Horn +Link: https://lore.kernel.org/r/20231206232706.374377-2-john.fastabend@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/tls/tls_sw.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/net/tls/tls_sw.c ++++ b/net/tls/tls_sw.c +@@ -1215,6 +1215,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-5.10/series b/queue-5.10/series index 581743385d6..9db5cf9d9de 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -34,3 +34,4 @@ mmc-rpmb-fixes-pause-retune-on-all-rpmb-partitions.patch mmc-core-cancel-delayed-work-before-releasing-host.patch mmc-sdhci-sprd-fix-emmc-init-failure-after-hw-reset.patch powerpc-update-ppc_save_regs-to-save-current-r1-in-pt_regs.patch +net-tls-update-curr-on-splice-as-well.patch