tls: handle data disappearing from under the TLS ULP

TLS expects that it owns the receive queue of the TCP socket.
This cannot be guaranteed in case the reader of the TCP socket
entered before the TLS ULP was installed, or uses some non-standard
read API (eg. zerocopy ones). Replace the WARN_ON() and a buggy
early exit (which leaves anchor pointing to a freed skb) with real
error handling. Wipe the parsing state and tell the reader to retry.

We already reload the anchor every time we (re)acquire the socket lock,
so the only condition we need to avoid is an out of bounds read
(not having enough bytes in the socket for previously parsed record len).

If some data was read from under TLS but there's enough in the queue
we'll reload and decrypt what is most likely not a valid TLS record.
Leading to some undefined behavior from TLS perspective (corrupting
a stream? missing an alert? missing an attack?) but no kernel crash
should take place.

Reported-by: William Liu <will@willsroot.io>
Reported-by: Savino Dicanosa <savy@syst3mfailure.io>
Link: https://lore.kernel.org/tFjq_kf7sWIG3A7CrCg_egb8CVsT_gsmHAK0_wxDPJXfIzxFAMxqmLwp3MlU5EHiet0AwwJldaaFdgyHpeIUCS-3m3llsmRzp9xIOBR4lAI=@syst3mfailure.io
Fixes: 84c61fe1a75b ("tls: rx: do not use the standard strparser")
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20250807232907.600366-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/tls/tls.h b/net/tls/tls.h
index 774859b63f0ded6ab53ae71b0891cb8a65b64b0b..4e077068e6d98ab850f58911e7ffcf08a76e382d 100644 (file)
--- a/net/tls/tls.h
+++ b/net/tls/tls.h
@@ -196,7 +196,7 @@ void tls_strp_msg_done(struct tls_strparser *strp);
 int tls_rx_msg_size(struct tls_strparser *strp, struct sk_buff *skb);
 void tls_rx_msg_ready(struct tls_strparser *strp);
 
-void tls_strp_msg_load(struct tls_strparser *strp, bool force_refresh);
+bool tls_strp_msg_load(struct tls_strparser *strp, bool force_refresh);
 int tls_strp_msg_cow(struct tls_sw_context_rx *ctx);
 struct sk_buff *tls_strp_msg_detach(struct tls_sw_context_rx *ctx);
 int tls_strp_msg_hold(struct tls_strparser *strp, struct sk_buff_head *dst);

diff --git a/net/tls/tls_strp.c b/net/tls/tls_strp.c
index 095cf31bae0ba96ca3ab58f9ac00ab62ba44694d..d71643b494a1ae689d8f1b0a8bb979eca104be5b 100644 (file)
--- a/net/tls/tls_strp.c
+++ b/net/tls/tls_strp.c
@@ -475,7 +475,7 @@ static void tls_strp_load_anchor_with_queue(struct tls_strparser *strp, int len)
        strp->stm.offset = offset;
 }
 
-void tls_strp_msg_load(struct tls_strparser *strp, bool force_refresh)
+bool tls_strp_msg_load(struct tls_strparser *strp, bool force_refresh)
 {
        struct strp_msg *rxm;
        struct tls_msg *tlm;
@@ -484,8 +484,11 @@ void tls_strp_msg_load(struct tls_strparser *strp, bool force_refresh)
        DEBUG_NET_WARN_ON_ONCE(!strp->stm.full_len);
 
        if (!strp->copy_mode && force_refresh) {
-               if (WARN_ON(tcp_inq(strp->sk) < strp->stm.full_len))
-                       return;
+               if (unlikely(tcp_inq(strp->sk) < strp->stm.full_len)) {
+                       WRITE_ONCE(strp->msg_ready, 0);
+                       memset(&strp->stm, 0, sizeof(strp->stm));
+                       return false;
+               }
 
                tls_strp_load_anchor_with_queue(strp, strp->stm.full_len);
        }
@@ -495,6 +498,8 @@ void tls_strp_msg_load(struct tls_strparser *strp, bool force_refresh)
        rxm->offset     = strp->stm.offset;
        tlm = tls_msg(strp->anchor);
        tlm->control    = strp->mark;
+
+       return true;
 }
 
 /* Called with lock held on lower socket */

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 549d1ea01a72a7e2eca07702c5f2fa14a3985754..51c98a007ddac4d9e66ec0902c84f1ef66920cb3 100644 (file)
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1384,7 +1384,8 @@ tls_rx_rec_wait(struct sock *sk, struct sk_psock *psock, bool nonblock,
                        return sock_intr_errno(timeo);
        }
 
-       tls_strp_msg_load(&ctx->strp, released);
+       if (unlikely(!tls_strp_msg_load(&ctx->strp, released)))
+               return tls_rx_rec_wait(sk, psock, nonblock, false);
 
        return 1;
 }