lkml.org 
[lkml]   [2022]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 32/60] Revert "net/tls: fix tls_sk_proto_close executed repeatedly"
    Date
    From: Jakub Kicinski <kuba@kernel.org>

    [ 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>
    ---
    net/tls/tls_main.c | 3 ---
    1 file changed, 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;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-27 13:36    [W:2.263 / U:0.424 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site