From: John Fastabend <john.fastabend@gmail.com>
Date: Wed, 6 Dec 2023 23:27:05 +0000 (-0800)
Subject: net: tls, update curr on splice as well
X-Git-Tag: v6.6.7~176
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb30a025982f61910f32e99778db3c0ceceaff5c;p=platform%2Fkernel%2Flinux-starfive.git

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>
---

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 779815b..27cc0f0 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;