From patchwork Thu Apr 18 13:38:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 162480 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp761295jan; Thu, 18 Apr 2019 06:40:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqz/SJnf/VOprV0E69E6mwkRqxoKtLkrJyyXqMYx7o+76DXfzhkKVzjlaQVy4wQnzIt6kzmV X-Received: by 2002:a62:6fc6:: with SMTP id k189mr77715025pfc.154.1555594851894; Thu, 18 Apr 2019 06:40:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555594851; cv=none; d=google.com; s=arc-20160816; b=xq+tgbJQbr3sww0DNEDTdGt7ji3XvAA5vjB15LdqMkPyTtElPXDaC1AgcR4SX2ceWD fixz5CsBTjUD5BHDyYfic8HSFOUTuRyr7FdwsjUuBWjMJRW/O4qvOhLS46IlBd4L6uGm zZuTGULZ9quY0SQEL759eqqukCZWOG9taPKYQWp6+rwofXegYF9GRYnYLHYXl0abFyi6 A7AOUSBXdlVlSWLaC/FruiqiATMRIYgb3F5UsOluYNc+z+wgmpmlnzge/dMvT7VxXaZd RTFNAKEJKgIc4dG2Ej7C99Kv1Y8vVt10KNlnbXEi737csHrN65KFRtFkCNWnrICDYrDY En8g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=7aWsblrUubLJUukbytwW5TJADaiVwqxkD5igRbKdC1Q=; b=vyXWepCvPxy8vW6WOAAQAM3+BIq5H6aASqAAnqzyppyUzUO9I23WCPvrTT3T/TRJY4 JeYslBFWjQJaa2JZP2NjLROer1ugn3gDCpy5k6Nwe2nnmH8mqpBsa591JpGlhRO950EW SXukxnlb7OIvrmmbB5QWr4xnVTkgMgtVa9vT1YKUyOPuL967vs+nd3SkAh6EK+OZBVSN 8F+97QxPfD1I2CrhOlwsHUCMRUVbP1zo1bZ/UR06RoCXaaeK/m0sCGXkbMmj9sqdJppf vcjnxfe9Y2gXrEwVlG09g/xvMLd5x9Hd5xOiynldes1PxdK9e0YDm0Y6YbOoc102MiWq uiTA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y193si1872835pgd.483.2019.04.18.06.40.51; Thu, 18 Apr 2019 06:40:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389366AbfDRNku (ORCPT + 30 others); Thu, 18 Apr 2019 09:40:50 -0400 Received: from foss.arm.com ([217.140.101.70]:33608 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388850AbfDRNks (ORCPT ); Thu, 18 Apr 2019 09:40:48 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C2D8880D; Thu, 18 Apr 2019 06:40:47 -0700 (PDT) Received: from e110176-lin.kfn.arm.com (e110176-lin.kfn.arm.com [10.50.4.178]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 275913F5AF; Thu, 18 Apr 2019 06:40:45 -0700 (PDT) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" Cc: Ofir Drang , stable@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 15/35] crypto: ccree: fix mem leak on error path Date: Thu, 18 Apr 2019 16:38:50 +0300 Message-Id: <20190418133913.9122-16-gilad@benyossef.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418133913.9122-1-gilad@benyossef.com> References: <20190418133913.9122-1-gilad@benyossef.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix a memory leak on the error path of IV generation code. Signed-off-by: Gilad Ben-Yossef Cc: stable@vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_ivgen.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.21.0 diff --git a/drivers/crypto/ccree/cc_ivgen.c b/drivers/crypto/ccree/cc_ivgen.c index 769458323394..1abec3896a78 100644 --- a/drivers/crypto/ccree/cc_ivgen.c +++ b/drivers/crypto/ccree/cc_ivgen.c @@ -154,9 +154,6 @@ void cc_ivgen_fini(struct cc_drvdata *drvdata) } ivgen_ctx->pool = NULL_SRAM_ADDR; - - /* release "this" context */ - kfree(ivgen_ctx); } /*! @@ -174,10 +171,12 @@ int cc_ivgen_init(struct cc_drvdata *drvdata) int rc; /* Allocate "this" context */ - ivgen_ctx = kzalloc(sizeof(*ivgen_ctx), GFP_KERNEL); + ivgen_ctx = devm_kzalloc(device, sizeof(*ivgen_ctx), GFP_KERNEL); if (!ivgen_ctx) return -ENOMEM; + drvdata->ivgen_handle = ivgen_ctx; + /* Allocate pool's header for initial enc. key/IV */ ivgen_ctx->pool_meta = dma_alloc_coherent(device, CC_IVPOOL_META_SIZE, &ivgen_ctx->pool_meta_dma, @@ -196,8 +195,6 @@ int cc_ivgen_init(struct cc_drvdata *drvdata) goto out; } - drvdata->ivgen_handle = ivgen_ctx; - return cc_init_iv_sram(drvdata); out: