]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net/tls: fix corrupted data in recvmsg
authorVadim Fedorenko <vfedorenko@novek.ru>
Sun, 15 Nov 2020 04:16:00 +0000 (07:16 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Nov 2020 12:28:58 +0000 (13:28 +0100)
commit9ecfcf48d7359498b8a52fc6ea64e4c202e26dad
tree99798870f60551990335f5e361afde776be211d5
parent9e909956d0c758c35c9a58fc00c4e1c3b323485f
net/tls: fix corrupted data in recvmsg

[ Upstream commit 3fe16edf6767decd640fa2654308bc64f8d656dc ]

If tcp socket has more data than Encrypted Handshake Message then
tls_sw_recvmsg will try to decrypt next record instead of returning
full control message to userspace as mentioned in comment. The next
message - usually Application Data - gets corrupted because it uses
zero copy for decryption that's why the data is not stored in skb
for next iteration. Revert check to not decrypt next record if
current is not Application Data.

Fixes: 692d7b5d1f91 ("tls: Fix recvmsg() to be able to peek across multiple records")
Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru>
Link: https://lore.kernel.org/r/1605413760-21153-1-git-send-email-vfedorenko@novek.ru
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/tls/tls_sw.c