Skip to content

Commit b903922

Browse files
author
CKI Backport Bot
committed
tls: fix handling of zero-length records on the rx_list
JIRA: https://issues.redhat.com/browse/RHEL-114328 CVE: CVE-2025-39682 Y-Commit: 62708b9 tls: fix handling of zero-length records on the rx_list 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: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com>
1 parent b3711ee commit b903922

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

net/tls/tls_sw.c

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

1786+
/* All records returned from a recvmsg() call must have the same type.
1787+
* 0 is not a valid content type. Use it as "no type reported, yet".
1788+
*/
17861789
static int tls_record_content_type(struct msghdr *msg, struct tls_msg *tlm,
17871790
u8 *control)
17881791
{
@@ -2026,8 +2029,10 @@ int tls_sw_recvmsg(struct sock *sk,
20262029
if (err < 0)
20272030
goto end;
20282031

2032+
/* process_rx_list() will set @control if it processed any records */
20292033
copied = err;
2030-
if (len <= copied || (copied && control != TLS_RECORD_TYPE_DATA) || rx_more)
2034+
if (len <= copied || rx_more ||
2035+
(control && control != TLS_RECORD_TYPE_DATA))
20312036
goto end;
20322037

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

0 commit comments

Comments
 (0)