Commit 162ecea4 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Lee Jones
Browse files

UPSTREAM: tls: make sure to abort the stream if headers are bogus



[ Upstream commit 0aeb54ac ]

Normally we wait for the socket to buffer up the whole record
before we service it. If the socket has a tiny buffer, however,
we read out the data sooner, to prevent connection stalls.
Make sure that we abort the connection when we find out late
that the record is actually invalid. Retrying the parsing is
fine in itself but since we copy some more data each time
before we parse we can overflow the allocated skb space.

Constructing a scenario in which we're under pressure without
enough data in the socket to parse the length upfront is quite
hard. syzbot figured out a way to do this by serving us the header
in small OOB sends, and then filling in the recvbuf with a large
normal send.

Make sure that tls_rx_msg_size() aborts strp, if we reach
an invalid record there's really no way to recover.

Bug: 432728472
Reported-by: default avatarLee Jones <lee@kernel.org>
Fixes: 84c61fe1 ("tls: rx: do not use the standard strparser")
Reviewed-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Link: https://patch.msgid.link/20250917002814.1743558-1-kuba@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit 208640e6)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I39902bec43845540a3787e4d95bb30348561ce05
parent a34ade04
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment