Skip to content

Commit

Permalink
Revert "net/tls: fix tls_sk_proto_close executed repeatedly"
Browse files Browse the repository at this point in the history
[ Upstream commit 1b205d9 ]

This reverts commit 69135c5.

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: 69135c5 ("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>
  • Loading branch information
kuba-moo authored and gregkh committed Jun 29, 2022
1 parent 340fbdc commit afbc954
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions net/tls/tls_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -787,9 +787,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;
Expand Down

0 comments on commit afbc954

Please sign in to comment.