Skip to content

Commit 4ff21a1

Browse files
committed
tls: fix handling of zero-length records on the rx_list
jira VULN-136508 cve CVE-2025-39682 commit-author Jakub Kicinski <kuba@kernel.org> commit 62708b9 Each recvmsg() call must process either - only contiguous DATA records (any number of them) - one non-DATA record If the next record has different type than what has already been processed we break out of the main processing loop. If the record has already been decrypted (which may be the case for TLS 1.3 where we don't know type until decryption) we queue the pending record to the rx_list. Next recvmsg() will pick it up from there. Queuing the skb to rx_list after zero-copy decrypt is not possible, since in that case we decrypted directly to the user space buffer, and we don't have an skb to queue (darg.skb points to the ciphertext skb for access to metadata like length). Only data records are allowed zero-copy, and we break the processing loop after each non-data record. So we should never zero-copy and then find out that the record type has changed. The corner case we missed is when the initial record comes from rx_list, and it's zero length. Reported-by: Muhammad Alifa Ramdhan <ramdhan@starlabs.sg> Reported-by: Billy Jheng Bing-Jhong <billy@starlabs.sg> Fixes: 84c61fe ("tls: rx: do not use the standard strparser") Reviewed-by: Sabrina Dubroca <sd@queasysnail.net> Link: https://patch.msgid.link/20250820021952.143068-1-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit 62708b9) Signed-off-by: Marcin Wcisło <marcin.wcislo@conclusive.pl>
1 parent 1eda239 commit 4ff21a1

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

net/tls/tls_sw.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1773,6 +1773,9 @@ int decrypt_skb(struct sock *sk, struct scatterlist *sgout)
17731773
return tls_decrypt_sg(sk, NULL, sgout, &darg);
17741774
}
17751775

1776+
/* All records returned from a recvmsg() call must have the same type.
1777+
* 0 is not a valid content type. Use it as "no type reported, yet".
1778+
*/
17761779
static int tls_record_content_type(struct msghdr *msg, struct tls_msg *tlm,
17771780
u8 *control)
17781781
{
@@ -2018,8 +2021,10 @@ int tls_sw_recvmsg(struct sock *sk,
20182021
if (err < 0)
20192022
goto end;
20202023

2024+
/* process_rx_list() will set @control if it processed any records */
20212025
copied = err;
2022-
if (len <= copied || (copied && control != TLS_RECORD_TYPE_DATA) || rx_more)
2026+
if (len <= copied || rx_more ||
2027+
(control && control != TLS_RECORD_TYPE_DATA))
20232028
goto end;
20242029

20252030
target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);

0 commit comments

Comments
 (0)