net/tls: avoid TCP window full during ->read_sock()
Subsystems (4)
PATCH v2 1/1 net/tls: avoid TCP window full during ->read_sock()
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.
--- net/tls/tls_sw.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
net/tls/tls_sw.c +5 -8
@@ -2240,7 +2240,6 @@ int tls_sw_read_sock(struct sock *sk, read_descriptor_t *desc, tlm =tls_msg (skb); }else {struct tls_decrypt_arg darg; -int to_decrypt; err =tls_rx_rec_wait (sk,NULL , true, released);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)); - 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);if (err <0 ) {tls_err_abort (sk, -EBADMSG ); goto read_sock_end; } - released =tls_read_flush_backlog (sk, prot, rxm->full_len, to_decrypt, - decrypted, &flushed_at); + released =tls_read_flush_backlog (sk, prot,INT_MAX , +0 , decrypted, + &flushed_at); skb = darg.skb; + rxm =strp_msg (skb); + tlm =tls_msg (skb); decrypted += rxm->full_len;tls_rx_rec_done (ctx);
Signature · 1 line
2.35.3
Quoted 9 lines
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_MAXand 0 as arguments totls_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 <[email protected]>Signed-off-by Hannes Reinecke <[email protected]>
This looks fine to me,
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Mon, 7 Aug 2023 09:10:22 +0200 you wrote:
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_MAXand 0 as arguments totls_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 <[email protected]>Signed-off-by Hannes Reinecke <[email protected]>[...]
Here is the summary with links:
- [PATCHv2] net/tls: avoid TCP window full during ->read_sock()
https://git.kernel.org/netdev/net-next/c/ba4a734e1aa0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html