]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'tls-fixes-for-record-type-handling-with-peek'
authorJakub Kicinski <kuba@kernel.org>
Wed, 21 Feb 2024 22:25:53 +0000 (14:25 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 21 Feb 2024 22:25:54 +0000 (14:25 -0800)
Sabrina Dubroca says:

====================
tls: fixes for record type handling with PEEK

There are multiple bugs in tls_sw_recvmsg's handling of record types
when MSG_PEEK flag is used, which can lead to incorrectly merging two
records:
 - consecutive non-DATA records shouldn't be merged, even if they're
   the same type (partly handled by the test at the end of the main
   loop)
 - records of the same type (even DATA) shouldn't be merged if one
   record of a different type comes in between
====================

Link: https://lore.kernel.org/r/cover.1708007371.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Trivial merge