]> www.infradead.org Git - users/dwmw2/linux.git/commit
tls: adjust recv return with async crypto and failed copy to userspace
authorSabrina Dubroca <sd@queasysnail.net>
Mon, 25 Mar 2024 15:56:46 +0000 (16:56 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 27 Mar 2024 03:48:24 +0000 (20:48 -0700)
commit85eef9a41d019b59be7bc91793f26251909c0710
treeb850e3485b0abcb1cda8c136bfbfdbb17046f2d7
parent7608a971fdeb4c3eefa522d1bfe8d4bc6b2481cc
tls: adjust recv return with async crypto and failed copy to userspace

process_rx_list may not copy as many bytes as we want to the userspace
buffer, for example in case we hit an EFAULT during the copy. If this
happens, we should only count the bytes that were actually copied,
which may be 0.

Subtracting async_copy_bytes is correct in both peek and !peek cases,
because decrypted == async_copy_bytes + peeked for the peek case: peek
is always !ZC, and we can go through either the sync or async path. In
the async case, we add chunk to both decrypted and
async_copy_bytes. In the sync case, we add chunk to both decrypted and
peeked. I missed that in commit 6caaf104423d ("tls: fix peeking with
sync+async decryption").

Fixes: 4d42cd6bc2ac ("tls: rx: fix return value for async crypto")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/1b5a1eaab3c088a9dd5d9f1059ceecd7afe888d1.1711120964.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/tls/tls_sw.c