tls: decrement decrypt_pending if no async completion will be called
authorSabrina Dubroca <sd@queasysnail.net>
Wed, 28 Feb 2024 22:43:57 +0000 (23:43 +0100)
committerJakub Kicinski <kuba@kernel.org>
Thu, 29 Feb 2024 17:07:16 +0000 (09:07 -0800)
With mixed sync/async decryption, or failures of crypto_aead_decrypt,
we increment decrypt_pending but we never do the corresponding
decrement since tls_decrypt_done will not be called. In this case, we
should decrement decrypt_pending immediately to avoid getting stuck.

For example, the prequeue prequeue test gets stuck with mixed
modes (one async decrypt + one sync decrypt).

Fixes: 94524d8fc965 ("net/tls: Add support for async decryption of tls records")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Link: https://lore.kernel.org/r/c56d5fc35543891d5319f834f25622360e1bfbec.1709132643.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/tls/tls_sw.c

index de96959336c480f5e467a22b0fb9887ef06d76fb..9f23ba321efe6c48721be793d848e148c58b7b4c 100644 (file)
@@ -289,6 +289,8 @@ static int tls_do_decryption(struct sock *sk,
                        return 0;
 
                ret = crypto_wait_req(ret, &ctx->async_wait);
+       } else if (darg->async) {
+               atomic_dec(&ctx->decrypt_pending);
        }
        darg->async = false;