]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
tls: rx: restore msg_iter before TLS 1.3 optimistic retry
authorJérémy Jean <Jeremy.Jean@oss.cyber.gouv.fr>
Tue, 4 Aug 2026 12:55:28 +0000 (12:55 +0000)
committerJakub Kicinski <kuba@kernel.org>
Thu, 6 Aug 2026 16:08:58 +0000 (09:08 -0700)
commit1c8629651cb54f7b51db8fc0b1a9944e4a4b0f5e
tree5f45195a198f5258ccfc0e59c54e724170e0252e
parent1f042e426be08a1da57fa7841fd13eb6764f8f60
tls: rx: restore msg_iter before TLS 1.3 optimistic retry

tls_decrypt_sg() advances msg->msg_iter when it maps user pages for
the optimistic TLS 1.3 zero-copy path. If the decrypted record turns
out not to be unpadded application data, tls_decrypt_sw() retries into
a kernel skb, but leaves the iterator advanced.

The subsequent copy from the skb then writes decrypted bytes again at
a later point in the caller iovecs while recvmsg() reports only the
post-retry length. A TLS peer can trigger this after the receiver
enables TLS_RX_EXPECT_NO_PAD.

Revert the iterator by the number of bytes consumed by the optimistic
mapping before retrying without zero-copy.

Add a selftest which sends a TLS 1.3 control record with
TLS_RX_EXPECT_NO_PAD enabled and verifies that recvmsg() does not
overwrite later iovecs beyond the returned length.

Fixes: ce61327ce989 ("tls: rx: support optimistic decrypt to user buffer with TLS 1.3")
Cc: stable@vger.kernel.org
Signed-off-by: Jérémy Jean <Jeremy.Jean@oss.cyber.gouv.fr>
Link: https://patch.msgid.link/20260804125528.2139928-1-Jeremy.Jean@oss.cyber.gouv.fr
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/tls/tls_sw.c
tools/testing/selftests/net/tls.c