From patchwork Mon Aug 17 15:15:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 247822 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2763714ilo; Mon, 17 Aug 2020 09:11:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTRTC6O2cxclgfKhuBSEIFoNxyyeqK9CAyYt75HXnxyf3ve13a9QQyk9U5TWu5jWdChquw X-Received: by 2002:aa7:d1cb:: with SMTP id g11mr15367816edp.26.1597680695251; Mon, 17 Aug 2020 09:11:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597680695; cv=none; d=google.com; s=arc-20160816; b=Z+8FKXu2zUbgyjihF2Pm2o8CAsz3IqA7xV/QJzy2mA+tmFv6YL4EV2vjQjyRrx7Kks 8/W7sAkIT04oUGBw7D8huLntdUYH4zJ7osDPNt8nyGLjjCD8bi7vEmNgvJJZK/ktl1sF kGqinqPAQY6aOIkLRFzbGlVntF+Ww4cQPyScJOqa9F1Q7S4g4JR1KDoo8nMfNMM0Vj8w 9aImNJrpkG7fq+H+YErC9tSbcXqVqkMouYHvhxa08T3+KscU/HYxVccOeUb15lOXnsKI bQBTbH0wXNW2GSzoCyxFwGzgKpdTUzkhZ+uj23aroKWWSmyMVAO++q+xsdLOuXlrudL3 FYbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8aS6GesVfLNExRkLMrzd3vMQLWsObJrC29iEA+pmuuI=; b=ev+BUMLJk22lJrCqj0QlV9gxs/rFZePy9/iDiePyZXXbxMh8PLf/N4el/99X1yzJpt r2GdtdAff6KlBJ2IvnnT8Pfi+YpnHEGzUqAhGcZ/8sBdjnl+ndOzHs8CyXxeGPeIvdJU OC7IfcEUMsCMysOx5sG++PrAOkK9TDEP+bobUjUyqoPsqJ9Cj4ITNYPO/yzODBznj9Mp HVYKYpiYGvEN05Gq9cEjEn6GTmn4i6vovCfKma0sJMjEOmo5VyiihMa/cISoBMBYySEw 8dzD4nwh9AiL6i2Yxp5Rdme/GxuPe563R+HrGxy3FPLzEbDa2WhWu6RjBgjYEqlXcYdc i8dQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Fk86VXhB; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b24si11113879edx.252.2020.08.17.09.11.34; Mon, 17 Aug 2020 09:11:35 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Fk86VXhB; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388614AbgHQQLU (ORCPT + 15 others); Mon, 17 Aug 2020 12:11:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:39652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388606AbgHQQLR (ORCPT ); Mon, 17 Aug 2020 12:11:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 916C022BF5; Mon, 17 Aug 2020 16:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680676; bh=5umpobZfU532MNHExFEMg4AwPASjY4mr8L46crhIfWk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fk86VXhBa4tBbGHDJxjIr3BWLnMCtm5NvY4KH2BvwV0GeQxkqmEr2iCPLAT8g6naT IailWnlTPxWuy038uF3UTU/n3WbWnBasI5TTPl6U1iiO+MahDp2x5lz6NU7XTSj1t6 rRqW0IaD1bReqwiDjsZ9DCzlvy2A5q43VecVJ9Wo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gilad Ben-Yossef , Markus Elfring , Herbert Xu , Sasha Levin Subject: [PATCH 4.19 012/168] crypto: ccree - fix resource leak on error path Date: Mon, 17 Aug 2020 17:15:43 +0200 Message-Id: <20200817143734.336080170@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143733.692105228@linuxfoundation.org> References: <20200817143733.692105228@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gilad Ben-Yossef [ Upstream commit 9bc6165d608d676f05d8bf156a2c9923ee38d05b ] Fix a small resource leak on the error path of cipher processing. Signed-off-by: Gilad Ben-Yossef Fixes: 63ee04c8b491e ("crypto: ccree - add skcipher support") Cc: Markus Elfring Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/ccree/cc_cipher.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) -- 2.25.1 diff --git a/drivers/crypto/ccree/cc_cipher.c b/drivers/crypto/ccree/cc_cipher.c index 28a5b8b38fa2f..1bcb6f0157b07 100644 --- a/drivers/crypto/ccree/cc_cipher.c +++ b/drivers/crypto/ccree/cc_cipher.c @@ -137,7 +137,6 @@ static int cc_cipher_init(struct crypto_tfm *tfm) skcipher_alg.base); struct device *dev = drvdata_to_dev(cc_alg->drvdata); unsigned int max_key_buf_size = cc_alg->skcipher_alg.max_keysize; - int rc = 0; dev_dbg(dev, "Initializing context @%p for %s\n", ctx_p, crypto_tfm_alg_name(tfm)); @@ -149,10 +148,19 @@ static int cc_cipher_init(struct crypto_tfm *tfm) ctx_p->flow_mode = cc_alg->flow_mode; ctx_p->drvdata = cc_alg->drvdata; + if (ctx_p->cipher_mode == DRV_CIPHER_ESSIV) { + /* Alloc hash tfm for essiv */ + ctx_p->shash_tfm = crypto_alloc_shash("sha256-generic", 0, 0); + if (IS_ERR(ctx_p->shash_tfm)) { + dev_err(dev, "Error allocating hash tfm for ESSIV.\n"); + return PTR_ERR(ctx_p->shash_tfm); + } + } + /* Allocate key buffer, cache line aligned */ ctx_p->user.key = kmalloc(max_key_buf_size, GFP_KERNEL); if (!ctx_p->user.key) - return -ENOMEM; + goto free_shash; dev_dbg(dev, "Allocated key buffer in context. key=@%p\n", ctx_p->user.key); @@ -164,21 +172,19 @@ static int cc_cipher_init(struct crypto_tfm *tfm) if (dma_mapping_error(dev, ctx_p->user.key_dma_addr)) { dev_err(dev, "Mapping Key %u B at va=%pK for DMA failed\n", max_key_buf_size, ctx_p->user.key); - return -ENOMEM; + goto free_key; } dev_dbg(dev, "Mapped key %u B at va=%pK to dma=%pad\n", max_key_buf_size, ctx_p->user.key, &ctx_p->user.key_dma_addr); - if (ctx_p->cipher_mode == DRV_CIPHER_ESSIV) { - /* Alloc hash tfm for essiv */ - ctx_p->shash_tfm = crypto_alloc_shash("sha256-generic", 0, 0); - if (IS_ERR(ctx_p->shash_tfm)) { - dev_err(dev, "Error allocating hash tfm for ESSIV.\n"); - return PTR_ERR(ctx_p->shash_tfm); - } - } + return 0; - return rc; +free_key: + kfree(ctx_p->user.key); +free_shash: + crypto_free_shash(ctx_p->shash_tfm); + + return -ENOMEM; } static void cc_cipher_exit(struct crypto_tfm *tfm)