Skip to content

Commit b0b6f20

Browse files
committed
tls: always refresh the queue when reading sock
jira VULN-89195 cve CVE-2025-38471 commit-author Jakub Kicinski <[email protected]> commit 4ab26bc After recent changes in net-next TCP compacts skbs much more aggressively. This unearthed a bug in TLS where we may try to operate on an old skb when checking if all skbs in the queue have matching decrypt state and geometry. BUG: KASAN: slab-use-after-free in tls_strp_check_rcv+0x898/0x9a0 [tls] (net/tls/tls_strp.c:436 net/tls/tls_strp.c:530 net/tls/tls_strp.c:544) Read of size 4 at addr ffff888013085750 by task tls/13529 CPU: 2 UID: 0 PID: 13529 Comm: tls Not tainted 6.16.0-rc5-virtme Call Trace: kasan_report+0xca/0x100 tls_strp_check_rcv+0x898/0x9a0 [tls] tls_rx_rec_wait+0x2c9/0x8d0 [tls] tls_sw_recvmsg+0x40f/0x1aa0 [tls] inet_recvmsg+0x1c3/0x1f0 Always reload the queue, fast path is to have the record in the queue when we wake, anyway (IOW the path going down "if !strp->stm.full_len"). Fixes: 0d87bbd ("tls: strp: make sure the TCP skbs do not have overlapping data") Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> (cherry picked from commit 4ab26bc) Signed-off-by: Brett Mastbergen <[email protected]>
1 parent cb6a36d commit b0b6f20

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

net/tls/tls_strp.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,9 +510,8 @@ static int tls_strp_read_sock(struct tls_strparser *strp)
510510
if (inq < strp->stm.full_len)
511511
return tls_strp_read_copy(strp, true);
512512

513+
tls_strp_load_anchor_with_queue(strp, inq);
513514
if (!strp->stm.full_len) {
514-
tls_strp_load_anchor_with_queue(strp, inq);
515-
516515
sz = tls_rx_msg_size(strp, strp->anchor);
517516
if (sz < 0) {
518517
tls_strp_abort_strp(strp, sz);

0 commit comments

Comments
 (0)