Commit db6a6c6863bd for kernel

commit db6a6c6863bd22b2543e313cb8e4807fdd33778b
Author: Chuck Lever <cel@kernel.org>
Date:   Wed Nov 11 10:55:19 2026 -0800

    tls: Consume empty data records in tls_sw_splice_read()

    A zero-length application_data record decrypts to full_len == 0,
    so tls_sw_splice_read() splices zero bytes and returns zero. A zero
    return from a splice read means EOF, and the caller tears down a
    connection that is still live.

    Consume the record and fetch the next one, as tls_sw_read_sock()
    does. The cap on consecutive empty records bounds the loop.

    When an empty record precedes a close_notify, splice(2) now returns
    -EINVAL from the control-record test instead of a false EOF. A
    splice that reaches an alert record already reports -EINVAL.

    Fixes: c46234ebb4d1 ("tls: RX path for ktls")
    Reported-by: Sabrina Dubroca <sd@queasysnail.net>
    Closes: https://lore.kernel.org/netdev/akaoXcfamBp8_mYe@krikkit/
    Signed-off-by: Chuck Lever <cel@kernel.org>
    Link: https://patch.msgid.link/20261111185522.2859004-3-kuba@kernel.org
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 5f149691fc0a..226e0f176fdc 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -2051,32 +2051,40 @@ 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 {
-		struct tls_decrypt_arg darg;
+	for (;;) {
+		if (!skb_queue_empty(&ctx->rx_list)) {
+			skb = __skb_dequeue(&ctx->rx_list);
+		} else {
+			struct tls_decrypt_arg darg;

-		err = tls_rx_rec_wait(sk, nonblock, true, false);
-		if (err <= 0)
-			goto splice_read_end;
+			err = tls_rx_rec_wait(sk, nonblock, true, false);
+			if (err <= 0)
+				goto splice_read_end;

-		memset(&darg.inargs, 0, sizeof(darg.inargs));
+			memset(&darg.inargs, 0, sizeof(darg.inargs));

-		err = tls_rx_one_record(sk, NULL, &darg);
-		if (err < 0)
-			goto splice_read_end;
+			err = tls_rx_one_record(sk, NULL, &darg);
+			if (err < 0)
+				goto splice_read_end;

-		tls_rx_rec_done(ctx);
-		skb = darg.skb;
-	}
+			tls_rx_rec_done(ctx);
+			skb = darg.skb;
+		}

-	rxm = strp_msg(skb);
-	tlm = tls_msg(skb);
+		rxm = strp_msg(skb);
+		tlm = tls_msg(skb);

-	/* splice does not support reading control messages */
-	if (tlm->control != TLS_RECORD_TYPE_DATA) {
-		err = -EINVAL;
-		goto splice_requeue;
+		/* splice does not support reading control messages */
+		if (tlm->control != TLS_RECORD_TYPE_DATA) {
+			err = -EINVAL;
+			goto splice_requeue;
+		}
+
+		/* Splicing zero bytes would read as EOF */
+		if (rxm->full_len)
+			break;
+
+		consume_skb(skb);
 	}

 	chunk = min_t(unsigned int, rxm->full_len, len);