summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-06-20 12:13:52 -0700
committerPaolo Abeni <pabeni@redhat.com>2022-06-23 10:08:30 +0200
commit1b205d948fbb06a7613d87dcea0ff5fd8a08ed91 (patch)
tree025c62a759f9dc10748bf36ac9502b100281c984
parent8af52fe9fd3bf5e7478da99193c0632276e1dfce (diff)
downloadlinux-stable-1b205d948fbb06a7613d87dcea0ff5fd8a08ed91.tar.gz
linux-stable-1b205d948fbb06a7613d87dcea0ff5fd8a08ed91.tar.bz2
linux-stable-1b205d948fbb06a7613d87dcea0ff5fd8a08ed91.zip
Revert "net/tls: fix tls_sk_proto_close executed repeatedly"
This reverts commit 69135c572d1f84261a6de2a1268513a7e71753e2. This commit was just papering over the issue, ULP should not get ->update() called with its own sk_prot. Each ULP would need to add this check. Fixes: 69135c572d1f ("net/tls: fix tls_sk_proto_close executed repeatedly") Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: John Fastabend <john.fastabend@gmail.com> Link: https://lore.kernel.org/r/20220620191353.1184629-1-kuba@kernel.org Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-rw-r--r--net/tls/tls_main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 46bd5f26338b..da176411c1b5 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -921,9 +921,6 @@ static void tls_update(struct sock *sk, struct proto *p,
{
struct tls_context *ctx;
- if (sk->sk_prot == p)
- return;
-
ctx = tls_get_ctx(sk);
if (likely(ctx)) {
ctx->sk_write_space = write_space;