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 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 53EFFC433DB for ; Tue, 9 Mar 2021 06:47:27 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 CC4FA65295 for ; Tue, 9 Mar 2021 06:47:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC4FA65295 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=9cfhO4KcrkGwlGo4VCROP0nVJl5mIXUKmzY7ZgCFz5I=; b=o+sfhptFY+d2+tF4uNVYIlcuI YhBKeHtcJTqyB6w9rek4144DTNGib8Asx8ojdWsPJtf9qxYhvk1dqUdnDAgJCVZtU8t5Z1L4Cp0sh AT2Q/LAMqD/jUkIyxqhFyE3SVGCnyWFDw2yZVkI15UQd8axVAKdF4manog9SS4bCqY+o93U2USEWK KrdZQYuoBJA7tigX2srHt9bqLZPtR/s7HfgqwCI3E2f+VSROPHRgttzCJZ+KCcszwreJpSq2GCADV 5bZA60r91DrbIVM/HlbYZZAGaMxijTRmb7f2w4v+aPbWMVgOJdSCgAX7DoIDb82PypJ5A4cp8Qbvn F4epeecEg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJW83-003vCH-MI; Tue, 09 Mar 2021 06:46:03 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJW7z-003vBV-RK for linux-arm-kernel@lists.infradead.org; Tue, 09 Mar 2021 06:46:02 +0000 Received: by mail-wr1-x432.google.com with SMTP id d15so13981779wrv.5 for ; Mon, 08 Mar 2021 22:45:59 -0800 (PST) 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=HSvFlw53ZQJ3UGmAhTTbZ6eZK5u9qhEy+Nh7KExbccc=; b=fy29+zfeZNIkS+o2CIi1qqh67fyRSIUwPGasxaXHbIs1vlhVx7gySfrZ+K0eFbadlf zVLHFAAHorvgDakN77jc+PQ19hU883vh3XcFLWHj7YE85LlfWIOArDAfSn0Nb3f0sWCM 9pBaipmXlVkS/8KYbssiaNZoA20jxxYeEoFzBBCfpmLfpiaqJSSeyBVCntTmm4tupAla ZQ3l4N11Yn//zKlIWyYcS23CAcYgaaC1T5PtGnmEUM+emhvWdxGai7eXPHoHIOl71HUY 9agn4bqkO+X4hmVXjrxyyKIfKRoCqdebXJm3KxV7dkeq6BAdGrJsNET8BueHiTTdeIZE TG0g== 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=HSvFlw53ZQJ3UGmAhTTbZ6eZK5u9qhEy+Nh7KExbccc=; b=XuFFJuEOJjDJ064RZEjYd99dfv3NqdEIasiJyUB/q1O78hTsGIZAsPGHk/JuNOOv2l tVOqbS+XkdLH1ZuaVc8VWfYOXmF1Xa6Aj0sWM1Ko3zhLZVI5P0/yOucIEzp/+ynZ11CK DiZtytWvW4UYaqb2W4VrV7vsNn5bv1kQmp0jd6piAqQLLlZmgr1lZXr6S6l3OujwJYFo 5rBKuGbeTAsBMqh6iNaDzkys6asxvRxwwwbNKQSL89qlthuk+2p620uN24TeRbjIkZGb Gjz+FoW9k86tiUBLj8yKWT+NksNx/u1XvSY2cCEsYAm6FgoJCLDjV3Pg4+Lmnq6i1ah7 xagA== X-Gm-Message-State: AOAM531hxJKYJU4jN9Ly/nC1BQiGNh3lgrJAeRMLJcKwYXXtm92/EmbT inXERt2DracpaVFFmzxUxkc= X-Google-Smtp-Source: ABdhPJzUHnqLkbm99mxf5QOHQ/QZEt2V1WJETLm9RyVeVyR3yjzlOIJJysXauA9TXWSPw+wEDKUPEA== X-Received: by 2002:a05:6000:1547:: with SMTP id 7mr26513480wry.301.1615272359215; Mon, 08 Mar 2021 22:45:59 -0800 (PST) Received: from Red ([2a01:cb1d:3d5:a100:264b:feff:fe03:2806]) by smtp.googlemail.com with ESMTPSA id c128sm2414351wma.37.2021.03.08.22.45.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 22:45:58 -0800 (PST) Date: Tue, 9 Mar 2021 07:45:57 +0100 From: Corentin Labbe To: Colin King Cc: Herbert Xu , "David S . Miller" , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] crypto: sun8i-ss: Fix memory leak of object d when dma_iv fails to map Message-ID: References: <20210302163446.21047-1-colin.king@canonical.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210302163446.21047-1-colin.king@canonical.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210309_064600_477359_757C9F34 X-CRM114-Status: GOOD ( 19.75 ) 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 Tue, Mar 02, 2021 at 04:34:46PM +0000, Colin King a =E9crit : > From: Colin Ian King > = > In the case where the dma_iv mapping fails, the return error path leaks > the memory allocated to object d. Fix this by adding a new error return > label and jumping to this to ensure d is free'd before the return. > = > Addresses-Coverity: ("Resource leak") > Fixes: ac2614d721de ("crypto: sun8i-ss - Add support for the PRNG") > Signed-off-by: Colin Ian King > --- > drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > = > diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c b/drivers/= crypto/allwinner/sun8i-ss/sun8i-ss-prng.c > index 08a1473b2145..3191527928e4 100644 > --- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c > +++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c > @@ -103,7 +103,8 @@ int sun8i_ss_prng_generate(struct crypto_rng *tfm, co= nst u8 *src, > dma_iv =3D dma_map_single(ss->dev, ctx->seed, ctx->slen, DMA_TO_DEVICE); > if (dma_mapping_error(ss->dev, dma_iv)) { > dev_err(ss->dev, "Cannot DMA MAP IV\n"); > - return -EFAULT; > + err =3D -EFAULT; > + goto err_free; > } > = > dma_dst =3D dma_map_single(ss->dev, d, todo, DMA_FROM_DEVICE); > @@ -167,6 +168,7 @@ int sun8i_ss_prng_generate(struct crypto_rng *tfm, co= nst u8 *src, > memcpy(ctx->seed, d + dlen, ctx->slen); > } > memzero_explicit(d, todo); > +err_free: > kfree(d); > = > return err; > -- = > 2.30.0 > = Hello Tested-by: Corentin Labbe Acked-by: Corentin Labbe Thanks _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel