summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorr.hering@avm.de <r.hering@avm.de>2018-01-12 15:42:06 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-31 14:03:45 +0100
commitd3048a12f3eccc00d62db373df4cd50b1218f6f1 (patch)
tree6a350d7372f756ce83b1f6d63ed79b5142d768c6 /include
parent32e57f8c557faed0cd976abfb800a2f363e6972a (diff)
net/tls: Fix inverted error codes to avoid endless loop
[ Upstream commit 30be8f8dba1bd2aff73e8447d59228471233a3d4 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/net/tls.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/tls.h b/include/net/tls.h
index c06db1eadac2..df950383b8c1 100644
--- a/include/net/tls.h
+++ b/include/net/tls.h
@@ -168,7 +168,7 @@ static inline bool tls_is_pending_open_record(struct tls_context *tls_ctx)
static inline void tls_err_abort(struct sock *sk)
{
- sk->sk_err = -EBADMSG;
+ sk->sk_err = EBADMSG;
sk->sk_error_report(sk);
}