diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-07-04 14:50:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-28 08:28:35 +0200 |
| commit | 53911428585db5042649fc568b2e12facc55d184 (patch) | |
| tree | aeeff3db17732a76b34a347650984e5a5fc9bd0f | |
| parent | d7728216dee122a21fe8732c4f202301a07cdd60 (diff) | |
| download | linux-stable-53911428585db5042649fc568b2e12facc55d184.tar.gz linux-stable-53911428585db5042649fc568b2e12facc55d184.tar.bz2 linux-stable-53911428585db5042649fc568b2e12facc55d184.zip | |
net/tls: fix poll ignoring partially copied records
[ Upstream commit 13aecb17acabc2a92187d08f7ca93bb8aad62c6f ]
David reports that RPC applications which use epoll() occasionally
get stuck, and that TLS ULP causes the kernel to not wake applications,
even though read() will return data.
This is indeed true. The ctx->rx_list which holds partially copied
records is not consulted when deciding whether socket is readable.
Note that SO_RCVLOWAT with epoll() is and has always been broken for
kernel TLS. We'd need to parse all records from the TCP layer, instead
of just the first one.
Fixes: 692d7b5d1f91 ("tls: Fix recvmsg() to be able to peek across multiple records")
Reported-by: David Beckett <david.beckett@netronome.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/tls/tls_sw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 41e17ed0c94e..fd931294f66f 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1931,7 +1931,8 @@ bool tls_sw_stream_read(const struct sock *sk) ingress_empty = list_empty(&psock->ingress_msg); rcu_read_unlock(); - return !ingress_empty || ctx->recv_pkt; + return !ingress_empty || ctx->recv_pkt || + !skb_queue_empty(&ctx->rx_list); } static int tls_read_size(struct strparser *strp, struct sk_buff *skb) |