]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
tls: don't skip over different type records from the rx_list
authorSabrina Dubroca <sd@queasysnail.net>
Thu, 15 Feb 2024 16:17:31 +0000 (17:17 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 21 Feb 2024 22:25:51 +0000 (14:25 -0800)
commitec823bf3a479d42c589dc0f28ef4951c49cd2d2a
tree8e5187005cd3cfa85ec9c4fd6996ea748f336f13
parentfdfbaec5923d9359698cbb286bc0deadbb717504
tls: don't skip over different type records from the rx_list

If we queue 3 records:
 - record 1, type DATA
 - record 2, some other type
 - record 3, type DATA
and do a recv(PEEK), the rx_list will contain the first two records.

The next large recv will walk through the rx_list and copy data from
record 1, then stop because record 2 is a different type. Since we
haven't filled up our buffer, we will process the next available
record. It's also DATA, so we can merge it with the current read.

We shouldn't do that, since there was a record in between that we
ignored.

Add a flag to let process_rx_list inform tls_sw_recvmsg that it had
more data available.

Fixes: 692d7b5d1f91 ("tls: Fix recvmsg() to be able to peek across multiple records")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Link: https://lore.kernel.org/r/f00c0c0afa080c60f016df1471158c1caf983c34.1708007371.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/tls/tls_sw.c