From patchwork Tue Mar 2 16:34:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin King X-Patchwork-Id: 12113983 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 DF0B1C433DB for ; Wed, 3 Mar 2021 17:46:21 +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 8095964EE8 for ; Wed, 3 Mar 2021 17:46:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8095964EE8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.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:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=zQCFXipLVpRryrM7JEmuvfmqUyB61Ea/EEbnkxaHSQk=; b=KOhRchifT7+uozPw0PCMdk9jCZ Db8FKgJWUr5IIlv4Fq2RhTtcLIq3ws+eZUNcRVOsPkd+p3R+4qXucMSyGnozuYjhMb8HlUZiDA+0k sZBYv7dfjq9GbL+sEJZzmn8SbhzqBuK2/jtLzYS8IxXZMDZzdx+qUJ/3S8APoFAC3WK3OZfxvIZe0 JM8iUKRH5NJBFA0XeohCU9K7ShSbvFzH9d97xsvtnD8uxBzGh2vdnvWNyuC0ogh4iKPwev5/3/8sC 3ZkneW0z6/6hTvlPTD3IAbXgGa5FitreZO9hN2jVH2RbSvbfZqYL0TXrxGtPWr1PlQToWhN34sVDi pT+W1aCw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHVXH-005rAl-Hf; Wed, 03 Mar 2021 17:43:48 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHSwF-005Fla-75 for linux-arm-kernel@desiato.infradead.org; Wed, 03 Mar 2021 14:57:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:In-Reply-To:References; bh=AUNMh3L3YnGEDt7GdBnRuRFB1THk9CubfGtT05oCqGU=; b=Ti2Q/2eB5dikse4371k5frXLJD ZViK33XeCwqoCCgQhwg7ulRyvOJBtyvM5b01tkNkl7dfdPEAzZoaTi0kOktmqsS1EOJG0YLNEObTK nmP34kDapA1Q4L0m60smafka34m70A2hjnJky5HpuPL5iLmMDBkqFJJXOD1n/GeFdB5Y1sINABUCp rJmQAgv5cdMvfTTpN7Oj+HIyfnaoX7uAMZKjN26g4Ug/kaJok0BaqF83JmlY2H6oAnAxkkoewSBGa ayXwZnnjhyjfTjbR2TlO0lAgWwc9ARrq+e+q5od3KU+OfVgRjFf4w82vMcsikwqZBIKxjsxCjCJR4 QgZm+T0A==; Received: from youngberry.canonical.com ([91.189.89.112]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lH7zh-00HSSN-0L for linux-arm-kernel@lists.infradead.org; Tue, 02 Mar 2021 16:35:42 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lH7yx-0008WF-5K; Tue, 02 Mar 2021 16:34:47 +0000 From: Colin King To: Corentin Labbe , Herbert Xu , "David S . Miller" , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] crypto: sun8i-ss: Fix memory leak of object d when dma_iv fails to map Date: Tue, 2 Mar 2021 16:34:46 +0000 Message-Id: <20210302163446.21047-1-colin.king@canonical.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210302_163542_182542_BA5C1ACA X-CRM114-Status: GOOD ( 11.42 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Tested-by: Corentin Labbe Acked-by: Corentin Labbe --- 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, const u8 *src, dma_iv = 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 = -EFAULT; + goto err_free; } dma_dst = dma_map_single(ss->dev, d, todo, DMA_FROM_DEVICE); @@ -167,6 +168,7 @@ int sun8i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src, memcpy(ctx->seed, d + dlen, ctx->slen); } memzero_explicit(d, todo); +err_free: kfree(d); return err;