Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/tls: avoid TCP window full during ->read_sock()

Browse Source 
When flushing the backlog after decoding a record we don't really
know how much data the caller want us to evaluate, so use INT_MAX
and 0 as arguments to tls_read_flush_backlog() to ensure we flush
at 128k of data. Otherwise we might be reading too much data and
trigger a TCP window full.

Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Link: https://lore.kernel.org/r/20230807071022.10091-1-hare@suse.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Hannes Reinecke 2023-08-07 09:10:22 +02:00 committed by Jakub Kicinski
parent 794529c448
commit ba4a734e1a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/tls/tls_sw.c
View File

@ -2240,7 +2240,6 @@ int tls_sw_read_sock(struct sock *sk, read_descriptor_t *desc,
tlm = tls_msg(skb); tlm = tls_msg(skb);
} else { } else {
struct tls_decrypt_arg darg; struct tls_decrypt_arg darg;
int to_decrypt;
err = tls_rx_rec_wait(sk, NULL, true, released); err = tls_rx_rec_wait(sk, NULL, true, released);
if (err <= 0) if (err <= 0)
@ -2248,20 +2247,18 @@ int tls_sw_read_sock(struct sock *sk, read_descriptor_t *desc,
memset(&darg.inargs, 0, sizeof(darg.inargs)); memset(&darg.inargs, 0, sizeof(darg.inargs));
rxm = strp_msg(tls_strp_msg(ctx));
tlm = tls_msg(tls_strp_msg(ctx));
to_decrypt = rxm->full_len - prot->overhead_size;
err = tls_rx_one_record(sk, NULL, &darg); err = tls_rx_one_record(sk, NULL, &darg);
if (err < 0) { if (err < 0) {
tls_err_abort(sk, -EBADMSG); tls_err_abort(sk, -EBADMSG);
goto read_sock_end; goto read_sock_end;
} }
released = tls_read_flush_backlog(sk, prot, rxm->full_len, to_decrypt, released = tls_read_flush_backlog(sk, prot, INT_MAX,
decrypted, &flushed_at); 0, decrypted,
&flushed_at);
skb = darg.skb; skb = darg.skb;
rxm = strp_msg(skb);
tlm = tls_msg(skb);
decrypted += rxm->full_len; decrypted += rxm->full_len;
tls_rx_rec_done(ctx); tls_rx_rec_done(ctx);