[SRU D 2/3] net/tls: fix no wakeup on partial reads

Thadeu Lima de Souza Cascardo cascardo at canonical.com
Wed Jul 22 19:34:01 UTC 2020

From: Jakub Kicinski <jakub.kicinski at netronome.com>

BugLink: https://bugs.launchpad.net/bugs/1888381

When tls_sw_recvmsg() partially copies a record it pops that
record from ctx->recv_pkt and places it on rx_list.

Next iteration of tls_sw_recvmsg() reads from rx_list via
process_rx_list() before it enters the decryption loop.
If there is no more records to be read tls_wait_data()
will put the process on the wait queue and got to sleep.
This is incorrect, because some data was already copied
in process_rx_list().

In case of RPC connections process may never get woken up,
because peer also simply blocks in read().

I think this may also fix a similar issue when BPF is at
play, because after __tcp_bpf_recvmsg() returns some data
we subtract it from len and use continue to restart the
loop, but len could have just reached 0, so again we'd
sleep unnecessarily. That's added by:
commit d3b18ad31f93 ("tls: add bpf support to sk_msg handling")

Fixes: 692d7b5d1f91 ("tls: Fix recvmsg() to be able to peek across multiple records")
Reported-by: David Beckett <david.beckett at netronome.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski at netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe at netronome.com>
Tested-by: David Beckett <david.beckett at netronome.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
(cherry picked from commit 04b25a5411f966c2e586909a8496553b71876fae)
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
 net/tls/tls_sw.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index b800e8b500e8..74513bcb3824 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1610,7 +1610,7 @@ int tls_sw_recvmsg(struct sock *sk,
 	len = len - copied;
 	timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
-	do {
+	while (len && (decrypted + copied < target || ctx->recv_pkt)) {
 		bool retain_skb = false;
 		bool async = false;
 		bool zc = false;
@@ -1712,11 +1712,7 @@ int tls_sw_recvmsg(struct sock *sk,
 		} else {
-		/* If we have a new message from strparser, continue now. */
-		if (decrypted + copied >= target && !ctx->recv_pkt)
-			break;
-	} while (len);
+	}
 	if (num_async) {

More information about the kernel-team mailing list