diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2022-06-20 12:13:52 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-29 08:58:47 +0200 |
| commit | bb18ad00c0b77acff2d6d5d5dda10e233e9a48d2 (patch) | |
| tree | f6a28be341e3e94367152d7968a1db8aedf88bbb | |
| parent | virtio_net: fix xdp_rxq_info bug after suspend/resume (diff) | |
| download | wireguard-linux-bb18ad00c0b77acff2d6d5d5dda10e233e9a48d2.tar.xz wireguard-linux-bb18ad00c0b77acff2d6d5d5dda10e233e9a48d2.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>
| -rw-r--r-- | net/tls/tls_main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index df9177d96f7f..7aba4ee77aba 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -803,9 +803,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; |