Commit af4db90a authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Treehugger Robot
Browse files

UPSTREAM: tls: fix handling of zero-length records on the rx_list



commit 62708b94 upstream.

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.

Bug: 440544511
Reported-by: default avatarMuhammad Alifa Ramdhan <ramdhan@starlabs.sg>
Reported-by: default avatarBilly Jheng Bing-Jhong <billy@starlabs.sg>
Fixes: 84c61fe1 ("tls: rx: do not use the standard strparser")
Reviewed-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Link: https://patch.msgid.link/20250820021952.143068-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit c09dd377)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I8c4c8db7d160497172be885ef5d82109b8e073ad
parent 5fe19d2f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment