summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorr.hering@avm.de <r.hering@avm.de>2018-01-12 15:42:06 +0100
committerDavid S. Miller <davem@davemloft.net>2018-01-15 14:21:57 -0500
commit30be8f8dba1bd2aff73e8447d59228471233a3d4 (patch)
tree752832ec446e7514fc64428f06a65fe2a2c28012 /net
parent95ef498d977bf44ac094778fd448b98af158a3e6 (diff)
downloadlinux-30be8f8dba1bd2aff73e8447d59228471233a3d4.tar.bz2
net/tls: Fix inverted error codes to avoid endless loop
sendfile() calls can hang endless with using Kernel TLS if a socket error occurs. Socket error codes must be inverted by Kernel TLS before returning because they are stored with positive sign. If returned non-inverted they are interpreted as number of bytes sent, causing endless looping of the splice mechanic behind sendfile(). Signed-off-by: Robert Hering <r.hering@avm.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/tls/tls_sw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 73d19210dd49..9773571b6a34 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -391,7 +391,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
while (msg_data_left(msg)) {
if (sk->sk_err) {
- ret = sk->sk_err;
+ ret = -sk->sk_err;
goto send_end;
}
@@ -544,7 +544,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page,
size_t copy, required_size;
if (sk->sk_err) {
- ret = sk->sk_err;
+ ret = -sk->sk_err;
goto sendpage_end;
}