From: Martin Belanger tls_sw_splice_read() passes one record to the pipe. It takes the record from rx_list or decrypts the next record from the socket. The next patch lets the kernel consume a KeyUpdate record. splice() then has no record to pass on and must decrypt the next one. Make the decrypt step a loop that runs until splice() has a record. No functional change: the loop sets skb on its first pass. Signed-off-by: Martin Belanger Reviewed-by: Hannes Reinecke --- net/tls/tls_sw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 771e02bff519..7f7a2f70b02a 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -2023,9 +2023,8 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos, if (err) goto splice_read_end; - if (!skb_queue_empty(&ctx->rx_list)) { - skb = __skb_dequeue(&ctx->rx_list); - } else { + skb = __skb_dequeue(&ctx->rx_list); + while (!skb) { struct tls_decrypt_arg darg; err = tls_rx_rec_wait(sk, nonblock, true, false); -- 2.53.0