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 92B81C4338F for ; Mon, 26 Jul 2021 06:54:09 +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 5AC2160F38 for ; Mon, 26 Jul 2021 06:54:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5AC2160F38 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=LUXhiDVzJ1RH9O2c8BQAtxjHMQ8Ri4hScdfRumaQcEI=; b=Ixu+XOguP7DZir wYlR5QWCeEWjSTBN/7TFBsu1b7uVcOHHpsQ/1yxkVCxJlacvwXU1idv0t2XN0qY/tZv/hUXqSio04 h+WzDMhnpDX41+vlVKFK8gwE24WowPCd535yhX2OavfBjWZxxTfYrbWaqWyRLtZWTSlt9vrjne0Zt sUTlftaGJhFLcPxsO+8G98mFmm8esDYctkkGiStdgBmaFSYMYyTx3hW/bkEdshTdTN0lUc56e1y74 UXCd9wUz6fos20HpYDoPG09tBzb7bWsDbeuhYTUo5DgBBrYrviBdlV2SMevWxUHba7mmOpqGmtziB uOyETzeXNQYm1zneTPgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m7uPT-009lce-Th; Mon, 26 Jul 2021 06:48:20 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m7uPP-009lbJ-IA for linux-arm-kernel@lists.infradead.org; Mon, 26 Jul 2021 06:48:17 +0000 Received: by mail-wr1-x429.google.com with SMTP id n12so6167867wrr.2 for ; Sun, 25 Jul 2021 23:48:14 -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=HI8l9G1w/LmqJ+8NhRIG+Zn8YfnZKKj5vpdyiBzKi+s=; b=Wezx2tcrng+SV4TczyYEUaFp3bl3kB2dLc1cSxaviOLUlDyjjiHYCzb/SOC+UJC3Qq CYkSHQsvY+8+9F+IQNrnAlSk7SReAXhEmgcDnXfc/guqupHDZMC6erwOzAAfbgHdlxeY ZExeu9E94RwE4aEHV2aNlfDJMi4UyNa0Ek8B1Or96uByblHN7xV0d3Fn/Qa4DKHlcHOB 4NUp+GOACNyWOsCy6OYEwh/OdaI/Sa/h0VTyowWpxlAB3OKn8chDxwtSic5jIH88IqLz JQYGvVr22sbI9cR4k88CdANHoFgSePtXCcaZAlfgf1aR2tPBrB7dzMjwI5qz+xfdlXKs P1GQ== 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=HI8l9G1w/LmqJ+8NhRIG+Zn8YfnZKKj5vpdyiBzKi+s=; b=GdQu1j/J3AcR5t0JeizNXqtTLYMsTPk78xGh20rj8Zq+3gKau0cTnVlmkdWKqGv4FH EMJUrmTHo05Dv9aQAyz/l0u2yMOj46sBVNZ+l0o2B/l3PX0PIDDW8MXLIN6cHqhoZmeN ANIxc6gsy0AWp6x/iw5C4VjjBKPvyVcdq8aOCVv8A/bAgtSRkPxOKqgs51SAiOYsxc0O hYO0fMa1cbAD/6s+o/zZHM7rg6z0fbYQ/7dGFxIxc49b0pfq1Cu00qcYum9d9A5mpNCq /sKN7nDtsHraLuLAPVftL2iHRYFD8/uq/8LpeKWIn63N/x3mY40FxWamGFe99C03vHR2 u9yg== X-Gm-Message-State: AOAM532LbTFDeBAnbVEaIBXxYy6d1e6ZNH3oklG1IsG+WuvFcSbDDzkM 6V5GZ+9cSbe7pz60UjnFgxI= X-Google-Smtp-Source: ABdhPJzMyWdoXuVXC6olUVGS9xCVUUeG5T8ELSqi28A/n8Ujo3ogFvmxwZpZwlzWLvrIVx7tncogMw== X-Received: by 2002:a5d:68cd:: with SMTP id p13mr3445295wrw.163.1627282093137; Sun, 25 Jul 2021 23:48:13 -0700 (PDT) Received: from Red ([2a01:cb1d:3d5:a100:264b:feff:fe03:2806]) by smtp.googlemail.com with ESMTPSA id m15sm35003070wmc.20.2021.07.25.23.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jul 2021 23:48:12 -0700 (PDT) Date: Mon, 26 Jul 2021 08:48:10 +0200 From: Corentin Labbe To: Dongliang Mu Cc: Herbert Xu , "David S. Miller" , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , "Jason A. Donenfeld" , Ard Biesheuvel , Eric Biggers , Colin Ian King , Xiang Chen , dan.carpenter@oracle.com, 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 memory leak and return value of sun8i_ce_hash_run Message-ID: References: <20210726062801.2078117-1-mudongliangabcd@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210726062801.2078117-1-mudongliangabcd@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210725_234815_653087_F9014DF6 X-CRM114-Status: GOOD ( 20.29 ) 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 02:27:50PM +0800, Dongliang Mu a =E9crit : > This patch fixes some memory leak caused by dma_mmap_sg/single > in the error handling code. In addition, it fixes the return value > when errors related with dma_mmap_sg/single occur. > = > Reported-by: Dongliang Mu > Fixes: 732b764099f65 ("crypto: sun8i-ce - fix two error path's memory lea= k") > Signed-off-by: Dongliang Mu > --- > .../crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 37 ++++++++++--------- > 1 file changed, 20 insertions(+), 17 deletions(-) > = > diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c b/drivers/= crypto/allwinner/sun8i-ss/sun8i-ss-hash.c > index 3c073eb3db03..7c4ed19f5466 100644 > --- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c > +++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c > @@ -324,11 +324,11 @@ int sun8i_ss_hash_run(struct crypto_engine *engine,= void *breq) > struct sun8i_ss_alg_template *algt; > struct sun8i_ss_dev *ss; > struct scatterlist *sg; > - int nr_sgs, err, digestsize; > + int j, i, todo, nr_sgs, tmp_err, digestsize; > + int err =3D 0; > unsigned int len; > u64 fill, min_fill, byte_count; > void *pad, *result; > - int j, i, todo; > __be64 *bebits; > __le64 *lebits; > dma_addr_t addr_res, addr_pad; > @@ -368,14 +368,14 @@ int sun8i_ss_hash_run(struct crypto_engine *engine,= void *breq) > if (nr_sgs <=3D 0 || nr_sgs > MAX_SG) { > dev_err(ss->dev, "Invalid sg number %d\n", nr_sgs); > err =3D -EINVAL; > - goto theend; > + goto err_result; > } > = > addr_res =3D dma_map_single(ss->dev, result, digestsize, DMA_FROM_DEVIC= E); > if (dma_mapping_error(ss->dev, addr_res)) { > dev_err(ss->dev, "DMA map dest\n"); > err =3D -EINVAL; > - goto theend; > + goto err_unmap_sg; > } > = > len =3D areq->nbytes; > @@ -390,7 +390,7 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, v= oid *breq) > if (len > 0) { > dev_err(ss->dev, "remaining len %d\n", len); > err =3D -EINVAL; > - goto theend; > + goto err_addr_res; > } > = > byte_count =3D areq->nbytes; > @@ -421,27 +421,30 @@ int sun8i_ss_hash_run(struct crypto_engine *engine,= void *breq) > } > = > addr_pad =3D dma_map_single(ss->dev, pad, j * 4, DMA_TO_DEVICE); > - rctx->t_src[i].addr =3D addr_pad; > - rctx->t_src[i].len =3D j; > - rctx->t_dst[i].addr =3D addr_res; > - rctx->t_dst[i].len =3D digestsize / 4; > if (dma_mapping_error(ss->dev, addr_pad)) { > dev_err(ss->dev, "DMA error on padding SG\n"); > err =3D -EINVAL; > - goto theend; > + goto err_addr_res; > } > + rctx->t_src[i].addr =3D addr_pad; > + rctx->t_src[i].len =3D j; > + rctx->t_dst[i].addr =3D addr_res; > + rctx->t_dst[i].len =3D digestsize / 4; > = > - err =3D sun8i_ss_run_hash_task(ss, rctx, crypto_tfm_alg_name(areq->base= .tfm)); > + tmp_err =3D sun8i_ss_run_hash_task(ss, rctx, crypto_tfm_alg_name(areq->= base.tfm)); > + > + memcpy(areq->result, result, algt->alg.hash.halg.digestsize); > + > + crypto_finalize_hash_request(engine, breq, tmp_err); > = > dma_unmap_single(ss->dev, addr_pad, j * 4, DMA_TO_DEVICE); > +err_addr_res: > + dma_unmap_single(ss->dev, addr_res, digestsize, DMA_FROM_DEVICE); > +err_unmap_sg: > dma_unmap_sg(ss->dev, areq->src, sg_nents(areq->src), > DMA_TO_DEVICE); > - dma_unmap_single(ss->dev, addr_res, digestsize, DMA_FROM_DEVICE); > - > - memcpy(areq->result, result, algt->alg.hash.halg.digestsize); > -theend: > +err_result: > kfree(pad); > kfree(result); > - crypto_finalize_hash_request(engine, breq, err); > - return 0; > + return err; > } Hello This is wrong, you need to always call crypto_finalize_hash_request() Do you have tested your changes ? Copying results before dma_unmap() is als= o very wrong, this will lead to random cache fail. Regards _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel