* [PATCH] net: tls, update curr on splice as well
@ 2023-12-14 19:45 John Fastabend
0 siblings, 0 replies; 3+ messages in thread
From: John Fastabend @ 2023-12-14 19:45 UTC (permalink / raw)
To: kuba, jannh, daniel; +Cc: john.fastabend, borisp, stable
commit c5a595000e2677e865a39f249c056bc05d6e55fd upstream.
Backport of upstream fix for tls on 6.1 and lower kernels.
The curr pointer must also be updated on the splice similar to how
we do this for other copy types.
Cc: stable@vger.kernel.org # 6.1.x-
Reported-by: Jann Horn <jannh@google.com>
Fixes: d829e9c4112b ("tls: convert to generic sk_msg interface")
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
---
net/tls/tls_sw.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 2e60bf06adff..0323040d34bc 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1225,6 +1225,8 @@ static int tls_sw_do_sendpage(struct sock *sk, struct page *page,
}
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;
--
2.33.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] net: tls, update curr on splice as well
@ 2024-01-09 22:59 John Fastabend
2024-01-11 9:56 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: John Fastabend @ 2024-01-09 22:59 UTC (permalink / raw)
To: stable, jannh, gregkh; +Cc: john.fastabend, kuba, daniel, borisp
commit c5a595000e2677e865a39f249c056bc05d6e55fd upstream.
Backport of upstream fix for tls on 5.x kernels.
The curr pointer must also be updated on the splice similar to how
we do this for other copy types.
Cc: stable@vger.kernel.org # 5.15.x
Cc: stable@vger.kernel.org # 5.10.x
Cc: stable@vger.kernel.org # 5.4.x
Reported-by: Jann Horn <jannh@google.com>
Fixes: d829e9c4112b ("tls: convert to generic sk_msg interface")
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
---
net/tls/tls_sw.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 101d231c1b61..9ff3e4df2d6c 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1216,6 +1216,8 @@ static int tls_sw_do_sendpage(struct sock *sk, struct page *page,
}
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;
--
2.33.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: tls, update curr on splice as well
2024-01-09 22:59 [PATCH] net: tls, update curr on splice as well John Fastabend
@ 2024-01-11 9:56 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2024-01-11 9:56 UTC (permalink / raw)
To: John Fastabend; +Cc: stable, jannh, kuba, daniel, borisp
On Tue, Jan 09, 2024 at 02:59:56PM -0800, John Fastabend wrote:
> commit c5a595000e2677e865a39f249c056bc05d6e55fd upstream.
>
> Backport of upstream fix for tls on 5.x kernels.
>
> The curr pointer must also be updated on the splice similar to how
> we do this for other copy types.
>
> Cc: stable@vger.kernel.org # 5.15.x
> Cc: stable@vger.kernel.org # 5.10.x
> Cc: stable@vger.kernel.org # 5.4.x
> Reported-by: Jann Horn <jannh@google.com>
> Fixes: d829e9c4112b ("tls: convert to generic sk_msg interface")
> Signed-off-by: John Fastabend <john.fastabend@gmail.com>
> ---
> net/tls/tls_sw.c | 2 ++
> 1 file changed, 2 insertions(+)
Now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-11 9:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-09 22:59 [PATCH] net: tls, update curr on splice as well John Fastabend
2024-01-11 9:56 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2023-12-14 19:45 John Fastabend
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox