Skip to content

Commit 62708b9

Browse files
committed
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 <[email protected]> Reported-by: Billy Jheng Bing-Jhong <[email protected]> Fixes: 84c61fe ("tls: rx: do not use the standard strparser") Reviewed-by: Sabrina Dubroca <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 9f6b606 commit 62708b9

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
@@ -1808,6 +1808,9 @@ int decrypt_skb(struct sock *sk, struct scatterlist *sgout)
18081808
return tls_decrypt_sg(sk, NULL, sgout, &darg);
18091809
}
18101810

1811+
/* All records returned from a recvmsg() call must have the same type.
1812+
* 0 is not a valid content type. Use it as "no type reported, yet".
1813+
*/
18111814
static int tls_record_content_type(struct msghdr *msg, struct tls_msg *tlm,
18121815
u8 *control)
18131816
{
@@ -2051,8 +2054,10 @@ int tls_sw_recvmsg(struct sock *sk,
20512054
if (err < 0)
20522055
goto end;
20532056

2057+
/* process_rx_list() will set @control if it processed any records */
20542058
copied = err;
2055-
if (len <= copied || (copied && control != TLS_RECORD_TYPE_DATA) || rx_more)
2059+
if (len <= copied || rx_more ||
2060+
(control && control != TLS_RECORD_TYPE_DATA))
20562061
goto end;
20572062

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

0 commit comments

Comments
 (0)