redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

net/tls: Fix inverted error codes to avoid endless loop 

[ Upstream commit 30be8f8dba ]

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>
pull/10/head
r.hering@avm.de 2018-01-12 15:42:06 +01:00 committed by Greg Kroah-Hartman
parent 32e57f8c55
commit d3048a12f3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/tls.h
View File

@ -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);
}

4
net/tls/tls_sw.c
View File

@ -407,7 +407,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;
}
@ -560,7 +560,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;
}