Skip to content

Commit 30be8f8

Browse files
Raubatodavem330
authored andcommitted
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>
1 parent 95ef498 commit 30be8f8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/net/tls.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ static inline bool tls_is_pending_open_record(struct tls_context *tls_ctx)
170170

171171
static inline void tls_err_abort(struct sock *sk)
172172
{
173-
sk->sk_err = -EBADMSG;
173+
sk->sk_err = EBADMSG;
174174
sk->sk_error_report(sk);
175175
}
176176

net/tls/tls_sw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
391391

392392
while (msg_data_left(msg)) {
393393
if (sk->sk_err) {
394-
ret = sk->sk_err;
394+
ret = -sk->sk_err;
395395
goto send_end;
396396
}
397397

@@ -544,7 +544,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page,
544544
size_t copy, required_size;
545545

546546
if (sk->sk_err) {
547-
ret = sk->sk_err;
547+
ret = -sk->sk_err;
548548
goto sendpage_end;
549549
}
550550

0 commit comments

Comments
 (0)