From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70DC4CCA479 for ; Mon, 20 Jun 2022 19:14:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245289AbiFTTOA (ORCPT ); Mon, 20 Jun 2022 15:14:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243729AbiFTTOA (ORCPT ); Mon, 20 Jun 2022 15:14:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75153186DF for ; Mon, 20 Jun 2022 12:13:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 25F97B8159F for ; Mon, 20 Jun 2022 19:13:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6EA2EC3411B; Mon, 20 Jun 2022 19:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655752436; bh=6nuGh2x7y8XjANkScnnQ62/aRk6Zq9kebVXfj7gkmTE=; h=From:To:Cc:Subject:Date:From; b=TxolPoXUmyw6j4zRR0q10IJe4VMZTQ2raKydGwwGt8SefONvZ/YwDrtpsjcU/qj6y UGPSqyiJhz7F3O/FLs4TbBuv8StMSwDAQNqAiDFVU2ahAzi0jRpOHhBZV2ePo8Qnnz yQ1DehzkRf31wCCdMdeDD4qJC9890q8VAgQT7JQ0D1SS2GYeq8gEReUkouPncJceMj qN/0DGDRvohpGkMt0wa/INcDZEi1RAFswjXQvMEKiNECTZasIpUXibHCeDqyoO+Jp4 zHF3QAb7rGmw28eB+C0z5JqcbgNXW/v29bRHNLroi90I1Snc1Md295oiNvQh1G4hWZ UMEN0DUoAvyeA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, Jakub Kicinski , borisp@nvidia.com, john.fastabend@gmail.com, william.xuanziyang@huawei.com Subject: [PATCH net 1/2] Revert "net/tls: fix tls_sk_proto_close executed repeatedly" Date: Mon, 20 Jun 2022 12:13:52 -0700 Message-Id: <20220620191353.1184629-1-kuba@kernel.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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(-) 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; -- 2.36.1