| Message ID | 20220620191353.1184629-1-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1b205d948fbb06a7613d87dcea0ff5fd8a08ed91 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,1/2] Revert "net/tls: fix tls_sk_proto_close executed repeatedly" | expand |
Jakub Kicinski wrote: > 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> > --- > CC: borisp@nvidia.com > CC: john.fastabend@gmail.com > CC: william.xuanziyang@huawei.com > --- > net/tls/tls_main.c | 3 --- > 1 file changed, 3 deletions(-) Reviewed-by: John Fastabend <john.fastabend@gmail.com>
Hello: This series was applied to netdev/net.git (master) by Paolo Abeni <pabeni@redhat.com>: On Mon, 20 Jun 2022 12:13:52 -0700 you wrote: > 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> > > [...] Here is the summary with links: - [net,1/2] Revert "net/tls: fix tls_sk_proto_close executed repeatedly" https://git.kernel.org/netdev/net/c/1b205d948fbb - [net,2/2] sock: redo the psock vs ULP protection check https://git.kernel.org/netdev/net/c/e34a07c0ae39 You are awesome, thank you!
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;
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> --- CC: borisp@nvidia.com CC: john.fastabend@gmail.com CC: william.xuanziyang@huawei.com --- net/tls/tls_main.c | 3 --- 1 file changed, 3 deletions(-)