summaryrefslogtreecommitdiff
path: root/net/tls
diff options
context:
space:
mode:
authorAndre Tomt <andre@tomt.net>2018-05-07 05:24:39 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-19 11:20:24 +0300
commit8e1b8e327903a77ca78233b9ae3e8ba2ef3c4364 (patch)
tree6e8b17718f51e4f0ee5639dd57656e68e52abafb /net/tls
parent3ac0f3e0b823a1217896ae70a731c825bf26f778 (diff)
downloadlinux-8e1b8e327903a77ca78233b9ae3e8ba2ef3c4364.tar.xz
net/tls: Fix connection stall on partial tls record
[ Upstream commit 080324c36ade319f57e505633ab54f6f53289b45 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 c314a66873da..dfef930d1e50 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -108,6 +108,7 @@ retry:
offset -= sg->offset;
ctx->partially_sent_offset = offset;
ctx->partially_sent_record = (void *)sg;
+ ctx->in_tcp_sendpages = false;
return ret;
}