summaryrefslogtreecommitdiffstats
path: root/net/tls
diff options
context:
space:
mode:
authorAndre Tomt <andre@tomt.net>2018-05-07 04:24:39 +0200
committerDavid S. Miller <davem@davemloft.net>2018-05-07 23:47:58 -0400
commit080324c36ade319f57e505633ab54f6f53289b45 (patch)
tree7e6788adfd15c650565938a3afa32b8f524aaebd /net/tls
parent53bc017f72b3b7f7f1bad3043c2d6dd87331ea44 (diff)
downloadlinux-stable-080324c36ade319f57e505633ab54f6f53289b45.tar.gz
linux-stable-080324c36ade319f57e505633ab54f6f53289b45.tar.bz2
linux-stable-080324c36ade319f57e505633ab54f6f53289b45.zip
net/tls: Fix connection stall on partial tls record
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tls')
-rw-r--r--net/tls/tls_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 74ed1e7af3d9..20cd93be6236 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -135,6 +135,7 @@ retry:
offset -= sg->offset;
ctx->partially_sent_offset = offset;
ctx->partially_sent_record = (void *)sg;
+ ctx->in_tcp_sendpages = false;
return ret;
}