summaryrefslogtreecommitdiffstats
path: root/net/tls
diff options
context:
space:
mode:
authorJohn Fastabend <john.fastabend@gmail.com>2023-12-06 15:27:05 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-12-13 18:45:10 +0100
commiteb30a025982f61910f32e99778db3c0ceceaff5c (patch)
tree22717fedfc7fed90ce84b338b9553565273d50d3 /net/tls
parent29561ef098a0f6ca5b98f7513580e9f6dfd810fb (diff)
downloadlinux-stable-eb30a025982f61910f32e99778db3c0ceceaff5c.tar.gz
linux-stable-eb30a025982f61910f32e99778db3c0ceceaff5c.tar.bz2
linux-stable-eb30a025982f61910f32e99778db3c0ceceaff5c.zip
net: tls, update curr on splice as well
[ Upstream commit c5a595000e2677e865a39f249c056bc05d6e55fd ] 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: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/tls')
-rw-r--r--net/tls/tls_sw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 779815b885e9..27cc0f0a90e1 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -952,6 +952,8 @@ static int tls_sw_sendmsg_splice(struct sock *sk, struct msghdr *msg,
}
sk_msg_page_add(msg_pl, page, part, off);
+ msg_pl->sg.copybreak = 0;
+ msg_pl->sg.curr = msg_pl->sg.end;
sk_mem_charge(sk, part);
*copied += part;
try_to_copy -= part;