From patchwork Mon Nov 9 12:55:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 322657 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5421BC56201 for ; Mon, 9 Nov 2020 13:29:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 170F52076E for ; Mon, 9 Nov 2020 13:29:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928587; bh=yMulE9rlSrV7iq5QtWhfmgazFmt1ZpjOySiPk6ta1Xo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uVA+JbP372k3CyhB9B8lJK6/7P1wXsqORGO0onaoKH/YwOPMXG2sN5V0RP0r1klyt eKq0aCOcc0mMZ5EDFOFat+r87YMs/1Kvv8EiGChQn4lCZ7Pc2giHCxgFPqBYmE0grB GkwhejfT/qGkfOURa2PMEo6iNi1OnITfOc92vEaU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731691AbgKINLt (ORCPT ); Mon, 9 Nov 2020 08:11:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:37332 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731316AbgKINLs (ORCPT ); Mon, 9 Nov 2020 08:11:48 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C31B720789; Mon, 9 Nov 2020 13:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927507; bh=yMulE9rlSrV7iq5QtWhfmgazFmt1ZpjOySiPk6ta1Xo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FveUesjE2iiDdYWTojNFVn5sK95Blcr2wvemHrH1nHB0cV0wzBBO81AJSi7jYVlTZ qHBR90zCUMPDAgmH4kvHirO7ejcCXUSWVfLXMtkyLGLfq6PcNR88eFOQSIziEhNDos NzlXl29htUZsoEcWDxyEjG5IPsEzzQUEqoLLjvxk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vinay Kumar Yadav , Jakub Kicinski Subject: [PATCH 5.4 12/85] chelsio/chtls: fix memory leaks caused by a race Date: Mon, 9 Nov 2020 13:55:09 +0100 Message-Id: <20201109125023.180764198@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125022.614792961@linuxfoundation.org> References: <20201109125022.614792961@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vinay Kumar Yadav [ Upstream commit 8080b462b6aa856ae05ea010441a702599e579f2 ] race between user context and softirq causing memleak, consider the call sequence scenario chtls_setkey() //user context chtls_peer_close() chtls_abort_req_rss() chtls_setkey() //user context work request skb queued in chtls_setkey() won't be freed because resources are already cleaned for this connection, fix it by not queuing work request while socket is closing. v1->v2: - fix W=1 warning. v2->v3: - separate it out from another memleak fix. Fixes: cc35c88ae4db ("crypto : chtls - CPL handler definition") Signed-off-by: Vinay Kumar Yadav Link: https://lore.kernel.org/r/20201102173650.24754-1-vinay.yadav@chelsio.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/chelsio/chtls/chtls_hw.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/crypto/chelsio/chtls/chtls_hw.c +++ b/drivers/crypto/chelsio/chtls/chtls_hw.c @@ -357,6 +357,9 @@ int chtls_setkey(struct chtls_sock *csk, if (ret) goto out_notcb; + if (unlikely(csk_flag(sk, CSK_ABORT_SHUTDOWN))) + goto out_notcb; + set_wr_txq(skb, CPL_PRIORITY_DATA, csk->tlshws.txqid); csk->wr_credits -= DIV_ROUND_UP(len, 16); csk->wr_unacked += DIV_ROUND_UP(len, 16);