diff mbox series

[net] net/tls: Fix connection stall on partial tls record

Message ID 20180507022439.265020-1-andre@tomt.net
State Accepted, archived
Delegated to: David Miller
Headers show
Series [net] net/tls: Fix connection stall on partial tls record | expand

Commit Message

Andre Tomt May 7, 2018, 2:24 a.m. UTC 
In the case of writing a partial tls record we forgot to clear the
ctx->in_tcp_sendpages flag, causing some connections to stall.

Fixes: c212d2c7fc47 ("net/tls: Don't recursively call push_record during tls_write_space callbacks")
Signed-off-by: Andre Tomt <andre@tomt.net>
---
 net/tls/tls_main.c | 1 +
 1 file changed, 1 insertion(+)

Comments

David Miller May 8, 2018, 3:49 a.m. UTC | #1 
From: Andre Tomt <andre@tomt.net>
Date: Mon,  7 May 2018 04:24:39 +0200

> In the case of writing a partial tls record we forgot to clear the
> ctx->in_tcp_sendpages flag, causing some connections to stall.
> 
> Fixes: c212d2c7fc47 ("net/tls: Don't recursively call push_record during tls_write_space callbacks")
> Signed-off-by: Andre Tomt <andre@tomt.net>

Applied, thanks Andre.
diff mbox series

Patch

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index cc03e00785c7..a02ebdfa0675 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -135,6 +135,7 @@  int tls_push_sg(struct sock *sk,
 			offset -= sg->offset;
 			ctx->partially_sent_offset = offset;
 			ctx->partially_sent_record = (void *)sg;
+			ctx->in_tcp_sendpages = false;
 			return ret;
 		}