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 X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 AFAFEC4338F for ; Mon, 2 Aug 2021 18:27:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 828C060F6E for ; Mon, 2 Aug 2021 18:27:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 828C060F6E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QxiE9+pD+np5CimeZ6PrOg+tjfr9Nca+QCL3lk6ZCnk=; b=1PnyFlG4IDDbNT QzPXJFbKRk5fhA4eoKF5B9y1/TtrIiLL8zRkujayA7j/dR4SYOAFRsaQULs221p+oDovGycGg0x8x dvsnpCi14zHqQJsXe2Jwbsn+LJQzgw06kac4Lm6ppDhTBhGjzak98mPoeSahCzrlh4A53wEuWYikc g2j77AXLcnC87TK0dDdONA/R3QUVk8lbpP2zlHmI/La9EMucxMFePN7qVn4prHPlQlFM0Jkm3oGj1 /WA4a88uQIvBxZImPvxkdz6v77iaOl9NQE90oMJrAZAe0/4//211bBSefBE7QDpDBpVL+t+psjVkZ h/ImAIGu1U9fTTPmFXTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAcd7-00HV7y-18; Mon, 02 Aug 2021 18:25:37 +0000 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAcd2-00HV75-Sv for linux-arm-kernel@lists.infradead.org; Mon, 02 Aug 2021 18:25:34 +0000 Received: by mail-wr1-x435.google.com with SMTP id b11so17189084wrx.6 for ; Mon, 02 Aug 2021 11:25:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=2PmZEzitR5QCFfVulNWIgxV1Tcx/s/ZuM62LoiFh3Nw=; b=t9WFOobW+5UA5d2UYmSatS4axpFhxEATNH3Fn4mwpxah92vkxPkZa7vAw0Di16hDaR jI9y03eCpaf5jbH40U4DdtWJxmP9aKD/OlfWStyS78uh0mDN3BOomJDP5/uyV39rzdJL cDCV0UZ1eM4eca9j95z5Aznn+OvE7TPIH6sSqB0afAOijc6HIsuBc1t1HZXiyn8AE71z iMm/4zq4T8ryUO+f9afiTI38ftuXPwQFCx6joFnbdkq4EiS7aBAGccu1tPyuwe4y5NU+ QqN1iNTiFB2J9JrOenHXj4cX+8+860Lr78SC0YzMLXXzHGQ3RLjz/44TM0ttaoUpn0LK bVCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=2PmZEzitR5QCFfVulNWIgxV1Tcx/s/ZuM62LoiFh3Nw=; b=Jxx0cXCNP+uWr7Ars/e726GNW8wiqxhwvVXqIFaLamKO1rrxqubvZzc9mYWxNvl097 y1axf/zFt1YpJZv46QRZPKSCebEou6UdIrhF7ufbUDi2P2hPe6qW+q5sIZE6umK68o65 +qE+UBZdPMpT3zSBcPXHl2PYi28NQWbf9VJJQFLYSQpyeniGg3PeC32yX69oKjxKf2uN zT1aEtwvkrB+tdLNBYHQP4vTiWj61ehc3heJQmtPXnn9eGx/29t9JgDxECdQVim6eUc/ doVw/03GqxfZ5lupQkpN5ySt8GFRL5agHHZJXHfmbUL7y9KjZL2t1HC9ccdAYJDYKLIr BhIA== X-Gm-Message-State: AOAM531Pmd0Dm8KuX+24d8Q9ToajS75WPqUK1KHIaTfziZW5xZjxCwNy UEwXn6uioazKV3qRFGoVqNM= X-Google-Smtp-Source: ABdhPJwOlRAo6UE/hfBKpzqdbr70Ac0w6M+TUi3HSMpfBx75Rn9kGrj0DNXn2tRbGfuTCVnVrT4GGA== X-Received: by 2002:adf:fd90:: with SMTP id d16mr20056591wrr.105.1627928730671; Mon, 02 Aug 2021 11:25:30 -0700 (PDT) Received: from Red ([2a01:cb1d:3d5:a100:264b:feff:fe03:2806]) by smtp.googlemail.com with ESMTPSA id z12sm10663448wml.18.2021.08.02.11.25.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 11:25:29 -0700 (PDT) Date: Mon, 2 Aug 2021 20:25:25 +0200 From: Corentin Labbe To: Dongliang Mu Cc: Herbert Xu , "David S. Miller" , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Ard Biesheuvel , Jonathan Corbet , Eric Biggers , Xiang Chen , Mauro Carvalho Chehab , Corentin Labbe , "Jason A. Donenfeld" , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH] crypto: sun8i-ce: fix multiple memory leaks in sun8i_ce_hash_run Message-ID: References: <20210726152724.2281408-1-mudongliangabcd@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210726152724.2281408-1-mudongliangabcd@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210802_112532_988200_75E32551 X-CRM114-Status: GOOD ( 23.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Le Mon, Jul 26, 2021 at 11:27:12PM +0800, Dongliang Mu a =E9crit : > In sun8i_ce_hash_run, all the dma_mmap_sg/single will cause memory leak > due to no corresponding unmap operation if errors happen. > = > Fix this by adding error handling part for all the dma_mmap_sg/single. > = I think it could be better worded, error handling is already there (but bad= ). > Fixes: 56f6d5aee88d ("crypto: sun8i-ce - support hash algorithms") > Signed-off-by: Dongliang Mu > --- > .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 28 +++++++++---------- > 1 file changed, 13 insertions(+), 15 deletions(-) > = > diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/= crypto/allwinner/sun8i-ce/sun8i-ce-hash.c > index 88194718a806..d454ad99deee 100644 > --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c > +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c > @@ -286,16 +286,14 @@ int sun8i_ce_hash_run(struct crypto_engine *engine,= void *breq) > = > /* the padding could be up to two block. */ > buf =3D kzalloc(bs * 2, GFP_KERNEL | GFP_DMA); > - if (!buf) { > - err =3D -ENOMEM; > - goto theend; Please keep all goto error for being consistent. > - } > + if (!buf) > + return -ENOMEM; > bf =3D (__le32 *)buf; > = > result =3D kzalloc(digestsize, GFP_KERNEL | GFP_DMA); > if (!result) { > - err =3D -ENOMEM; > - goto theend; > + kfree(buf); > + return -ENOMEM; > } > = > flow =3D rctx->flow; > @@ -321,7 +319,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, v= oid *breq) > if (nr_sgs <=3D 0 || nr_sgs > MAX_SG) { > dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs); > err =3D -EINVAL; > - goto theend; > + goto err_result; > } > = > len =3D areq->nbytes; > @@ -334,7 +332,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, v= oid *breq) > if (len > 0) { > dev_err(ce->dev, "remaining len %d\n", len); > err =3D -EINVAL; > - goto theend; > + goto err_unmap_sg; > } > addr_res =3D dma_map_single(ce->dev, result, digestsize, DMA_FROM_DEVIC= E); > cet->t_dst[0].addr =3D cpu_to_le32(addr_res); > @@ -342,7 +340,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, v= oid *breq) > if (dma_mapping_error(ce->dev, addr_res)) { > dev_err(ce->dev, "DMA map dest\n"); > err =3D -EINVAL; > - goto theend; > + goto err_unmap_sg; > } > = > byte_count =3D areq->nbytes; > @@ -392,7 +390,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, v= oid *breq) > if (dma_mapping_error(ce->dev, addr_pad)) { > dev_err(ce->dev, "DMA error on padding SG\n"); > err =3D -EINVAL; > - goto theend; > + goto err_addr_res; > } > = > if (ce->variant->hash_t_dlen_in_bits) > @@ -405,15 +403,15 @@ int sun8i_ce_hash_run(struct crypto_engine *engine,= void *breq) > err =3D sun8i_ce_run_task(ce, flow, crypto_tfm_alg_name(areq->base.tfm)= ); > = > dma_unmap_single(ce->dev, addr_pad, j * 4, DMA_TO_DEVICE); > +err_addr_res: > + dma_unmap_single(ce->dev, addr_res, digestsize, DMA_FROM_DEVICE); > +err_unmap_sg: > dma_unmap_sg(ce->dev, areq->src, sg_nents(areq->src), > DMA_TO_DEVICE); > - dma_unmap_single(ce->dev, addr_res, digestsize, DMA_FROM_DEVICE); > - > - > memcpy(areq->result, result, algt->alg.hash.halg.digestsize); The result should be copied only when everything is ok. Please add a "if (!= err)" Thanks for your work Regards _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel