This is a note to let you know that I've just added the patch titled
tls: rx: assume crypto always calls our callback
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tls-rx-assume-crypto-always-calls-our-callback.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 4d8900bf4b8d44dab517788ebb440b614a6a719c
Author: Jakub Kicinski <kuba@xxxxxxxxxx>
Date: Mon Apr 11 12:19:12 2022 -0700
tls: rx: assume crypto always calls our callback
[ Upstream commit 1c699ffa48a15710746989c36a82cbfb07e8d17f ]
If crypto didn't always invoke our callback for async
we'd not be clearing skb->sk and would crash in the
skb core when freeing it. This if must be dead code.
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Stable-dep-of: f7fa16d49837 ("tls: decrement decrypt_pending if no async completion will be called")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 85fa49170b4e5..27ac27daec868 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -277,9 +277,6 @@ static int tls_do_decryption(struct sock *sk,
if (ret == -EBADMSG)
TLS_INC_STATS(sock_net(sk), LINUX_MIB_TLSDECRYPTERROR);
- if (async)
- atomic_dec(&ctx->decrypt_pending);
-
return ret;
}
