From: Jakub Kicinski Date: Wed, 21 Feb 2024 22:25:53 +0000 (-0800) Subject: Merge branch 'tls-fixes-for-record-type-handling-with-peek' X-Git-Tag: Ubuntu-6.8.0-17.17~1416^2~13 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f76d5f65805695afc65e4c265bd119b7e2e88442;p=mirror_ubuntu-kernels.git Merge branch 'tls-fixes-for-record-type-handling-with-peek' 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 --- f76d5f65805695afc65e4c265bd119b7e2e88442