tls: separate no-async decryption request handling from async
PATCH 1/1 tls: separate no-async decryption request handling from async
From: Sabrina Dubroca <[email protected]>
If we're not doing async, the handling is much simpler. There's no reference counting, we just need to wait for the completion to wake us up and return its result.
We should preferably also use a separate crypto_wait. I'm not seeing a UAF as I did in the past, I think aec7961916f3 ("tls: fix race between async notify and socket close") took care of it.
This will make the next fix easier.
CVE: CVE-2024-58240
Signed-off-by Sabrina Dubroca <[email protected]>
Link https://lore.kernel.org/r/47bde5f649707610eaef9f0d679519966fc31061.1709132643.git.sd@queasysnail.net open here
Signed-off-by Jakub Kicinski <[email protected]>
(cherry picked from commit 41532b785e9d79636b3815a64ddf6a096647d011)
Signed-off-by Wengang Wang <[email protected]>
Conflicts:
net/tls/tls_sw.c
--- net/tls/tls_sw.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
net/tls/tls_sw.c +10 -7
@@ -257,18 +257,21 @@ static int tls_do_decryption(struct sock *sk, tls_decrypt_done, skb);atomic_inc (&ctx->decrypt_pending); }else { +DECLARE_CRYPTO_WAIT (wait); +aead_request_set_callback (aead_req,CRYPTO_TFM_REQ_MAY_BACKLOG , - crypto_req_done, &ctx->async_wait); + crypto_req_done, &wait); + + ret =crypto_aead_decrypt (aead_req); +if (ret == -EINPROGRESS || ret == -EBUSY ) + ret =crypto_wait_req (ret, &wait); +return ret; } ret =crypto_aead_decrypt (aead_req); -if (ret == -EINPROGRESS ) { -if (async) -return ret; - - ret =crypto_wait_req (ret, &ctx->async_wait); - } +if (ret == -EINPROGRESS ) +return ret;if (async)atomic_dec (&ctx->decrypt_pending);
Signature · 1 line
2.50.1 (Apple Git-155)
Quoted 1 line · Wengang Wang
Subject: [PATCH 5.10.y] tls: separate no-async decryption request handling from async
Queued for 5.10, thanks.
Signature · 2 lines
Thanks, Sasha