From a481022356a6d17b4ba8d1a070f16a24d58fd948 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 11 Jan 2024 10:58:50 +0100 Subject: [PATCH] 5.15-stable patches added patches: net-tls-update-curr-on-splice-as-well.patch --- ...et-tls-update-curr-on-splice-as-well.patch | 33 +++++++++++++++++++ queue-5.15/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 queue-5.15/net-tls-update-curr-on-splice-as-well.patch diff --git a/queue-5.15/net-tls-update-curr-on-splice-as-well.patch b/queue-5.15/net-tls-update-curr-on-splice-as-well.patch new file mode 100644 index 00000000000..3daeb6cbb2e --- /dev/null +++ b/queue-5.15/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 +@@ -1216,6 +1216,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.15/series b/queue-5.15/series index 9fbcf07844e..40c912a58f1 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -49,3 +49,4 @@ mmc-meson-mx-sdhc-fix-initialization-frozen-issue.patch 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 +net-tls-update-curr-on-splice-as-well.patch -- 2.47.3