This is a note to let you know that I've just added the patch titled
net: tls, update curr on splice as well
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-tls-update-curr-on-splice-as-well.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c5a595000e2677e865a39f249c056bc05d6e55fd Mon Sep 17 00:00:00 2001
From: John Fastabend <john.fastabend@xxxxxxxxx>
Date: Wed, 6 Dec 2023 15:27:05 -0800
Subject: net: tls, update curr on splice as well
From: John Fastabend <john.fastabend@xxxxxxxxx>
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@xxxxxxxxx>
Reported-by: Jann Horn <jannh@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20231206232706.374377-2-john.fastabend@xxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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;
Patches currently in stable-queue which might be from john.fastabend@xxxxxxxxx are
queue-6.1/net-tls-update-curr-on-splice-as-well.patch
