Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp2106132rdb; Thu, 7 Dec 2023 20:04:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IEB8loi2xrqA/h5cSsfuoa/yWpsKud7/tCiSbBbJ3MoOcvf/eXucP7HYkE83VzM2Bw6yZ09 X-Received: by 2002:a05:6a20:e597:b0:18f:97c:5ba7 with SMTP id ng23-20020a056a20e59700b0018f097c5ba7mr2548499pzb.117.1702008284059; Thu, 07 Dec 2023 20:04:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702008284; cv=none; d=google.com; s=arc-20160816; b=jAA7w25gwOAsfHdmJ8lapREndLY1NVOzNjHTQV0YxAZHVsDe2v6ASEVbYPMpCN5x+z Vgq3qQVvURWme1HgcVfts7PmlrXd51whDE+FFxPvJxvUI142AJ9g05BUKrKGcbpUxK3s 12WAljFxNSU7dkHTULBiPjqKijUsTiQbXMrcfDAhHvtix/fJEsqamfykl+vPVzU9htzt Hdhqle4OIm95VQdSMRDhbGrBJTKEFQAkBy7VVCL04bXy5xgbNcQD7wqWl9myQzBRbyjl cONd4689j5kGx3vuju8cGQWPErLGJxR5fjrQgP4R7PhLTlWq8Q6VF/StYqYLh4KJupOy 4yMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=Xim3wHAiF1skjde8lXvQC975k9ogKJ+N6AO80ZheVc0=; fh=Qp3WqSl04ZmGcly2kAet+8M5RyNsE5VS4HZHe6j9q+E=; b=Vh95omaHgPJ6fIc9u+ZmUyajW24jD356Y5o9XGDHhJLhCXJwXpr4ngrqC1iILCw83U /DqIC4z/a2zeVVxTBvubPf07Ovjut2zuWQLdlU9S1WaMr7kB/CBbAKKqOCazVRyfUDNg e2xx+GusxAeYIapa425OP+19eM1ti7QDFnJkdIYAWyiB6RjTvCIXAOa1Ibv+cfg2zumV 5o4sUcRufvcYFUA2GxBCnTcfijDywZUt/c2lCsAGjSxv10ZqspXkydPPIPZm9Fwl3wKl +3mfN1ZTQlMgmNVTkdU8N2ntNjuRSZO98S/3EYNQ3a/ukuVKGoxDoxyufDPrGnlfcoLy DiDg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id x23-20020a17090abc9700b00286c80ac075si2227648pjr.177.2023.12.07.20.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 20:04:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 186FC823B3EC; Thu, 7 Dec 2023 20:04:41 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231892AbjLHEEY (ORCPT + 99 others); Thu, 7 Dec 2023 23:04:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229531AbjLHEEX (ORCPT ); Thu, 7 Dec 2023 23:04:23 -0500 Received: from abb.hmeau.com (abb.hmeau.com [144.6.53.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 394EB1712; Thu, 7 Dec 2023 20:04:29 -0800 (PST) Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.94.2 #2 (Debian)) id 1rBS66-008Ias-LB; Fri, 08 Dec 2023 12:04:19 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Fri, 08 Dec 2023 12:04:28 +0800 Date: Fri, 8 Dec 2023 12:04:28 +0800 From: Herbert Xu To: Dinghao Liu Cc: Tom Lendacky , John Allen , "David S. Miller" , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] [v2] crypto: ccp - fix memleak in ccp_init_dm_workarea Message-ID: References: <20231127034710.23413-1-dinghao.liu@zju.edu.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231127034710.23413-1-dinghao.liu@zju.edu.cn> X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 07 Dec 2023 20:04:41 -0800 (PST) On Mon, Nov 27, 2023 at 11:47:10AM +0800, Dinghao Liu wrote: > When dma_map_single() fails, wa->address is supposed to be freed > by the callers of ccp_init_dm_workarea() through ccp_dm_free(). > However, many of the call spots don't expect to have to call > ccp_dm_free() on failure of ccp_init_dm_workarea(), which may > lead to a memleak. Let's free wa->address in ccp_init_dm_workarea() > when dma_map_single() fails. > > Fixes: 63b945091a07 ("crypto: ccp - CCP device driver and interface support") > Signed-off-by: Dinghao Liu > --- > > Changelog: > > v2: -Improve the commit message. > -Set wa->address to NULL after kfree() to prevent double-free. > --- > drivers/crypto/ccp/ccp-ops.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Patch applied. Thanks. -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt