summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-06-20 12:13:52 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-29 09:03:25 +0200
commiteb93999705650a86d4d039e3ff71f99bf1f40c59 (patch)
treefbc881180c0a28f549ecf0816a34868efaf85abb /net
parent8d7fe9ad6fddc2af8bde4b921b4f8fab231ed38c (diff)
downloadlinux-eb93999705650a86d4d039e3ff71f99bf1f40c59.tar.gz
linux-eb93999705650a86d4d039e3ff71f99bf1f40c59.tar.bz2
linux-eb93999705650a86d4d039e3ff71f99bf1f40c59.zip
Revert "net/tls: fix tls_sk_proto_close executed repeatedly"
[ Upstream commit 1b205d948fbb06a7613d87dcea0ff5fd8a08ed91 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
-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 057c1af6182a..9aac9c60d786 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -790,9 +790,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;