From patchwork Mon May 20 12:13:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 164632 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp243841ili; Mon, 20 May 2019 05:47:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqxvI06G8j2EOFY0NNWpHB7hO5BAZW+hwvFEvBU2nnVp3XR+FBqCrX4hgpcNopwd5CqpytLb X-Received: by 2002:a17:902:6a83:: with SMTP id n3mr76271216plk.109.1558356424345; Mon, 20 May 2019 05:47:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558356424; cv=none; d=google.com; s=arc-20160816; b=eitBcPm7t+y5IIZmjsKsu1MEpmp73W0U/AXtTWxDek1aXsp4U3DbBoa3HlkLkhB12C RPDP2tmYQgXx7aFwk9XbretIoPM5THCdiL6BW90EUQFbHhrgJXWrJFS4iyoHxObB4SUV gfsiyk4GI03NGFJKHLKxGaodgK3CNbsrFXHhKH6yeoB2G2vZhFfb3u5A0mOleUTui01H FwzOgf/mf46MoRxwe+xtx4glV9+uyUcju0onF8veI9lk/sxmGHl36O4yXrci1Y+Vg+Qn Ik+f5S3G9R1qtJGszE9e9eH13175qGH6r8+uKmQnhgoENWcmj6kdf4loYzhIj8b2U9My dwtA== 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=TEOjFFbIAKtWDVj7b5kOGp66OjQtTgLzbcPkVCXl414=; b=q2v8XFdecZVPKHQHC/wTk60OOWd/gtcUbu+9V6R6RF1kpNecqZUw+DK2oYh5YaMKuq bJE/sP0nIzbXriHX6ZdJKIIbnO+rh4hcrTIxko42xQc+4z2OnV1cO4KOtZ1AGzlKiKx5 oLxohvZ5m5jQctJhlbDcI+1xcgwkQdzUCgJ7b/zUGDh/0zPOAmppad2+M2yGu2cotWgD VXP3mW5RTUL4OhDAMo+lHA3+5rKeIJgxhBUi34gbBTaDgD/l5uUTC0CcHC/9C9DSm7EW DjM/iIYIDbC8UWCSPokZo/Yjm7pzzzMNSt1+Onr/Fy6T5lhPf7Hua2Rmu6/0ozbs7AEG pxhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=u3fL8GWx; 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 e11si12396932pgv.569.2019.05.20.05.47.00; Mon, 20 May 2019 05:47:04 -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; dkim=pass header.i=@kernel.org header.s=default header.b=u3fL8GWx; 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 S2390969AbfETMnp (ORCPT + 30 others); Mon, 20 May 2019 08:43:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:44662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389741AbfETM2q (ORCPT ); Mon, 20 May 2019 08:28:46 -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 DB4BA20645; Mon, 20 May 2019 12:28:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355325; bh=Vc76SIEwx46ODrXQqltdqyN2/mHnKSGbQiibyzx/1hQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u3fL8GWx5H2E4fXJg3vZp359nb0eI5emHn+kqjplqzM/GTfYpaMckmXA6Pl+TPpx6 oBvKj/PkRcW4OkY+ZYpHidy4Nsmf99tghxty7lPg4VjJJuhIiNO6n2a9yLd+Edrm1r HhBsRxGBZDRHdEPFnrMaX3ptgIWKFiet+Q2YJlkM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gilad Ben-Yossef , Herbert Xu Subject: [PATCH 5.0 059/123] crypto: ccree - fix mem leak on error path Date: Mon, 20 May 2019 14:13:59 +0200 Message-Id: <20190520115248.697804651@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115245.439864225@linuxfoundation.org> References: <20190520115245.439864225@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gilad Ben-Yossef commit d574b707c873d6ef1a2a155f8cfcfecd821e9a2e upstream. 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+ Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/ccree/cc_ivgen.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- 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 *dr } ivgen_ctx->pool = NULL_SRAM_ADDR; - - /* release "this" context */ - kfree(ivgen_ctx); } /*! @@ -174,10 +171,12 @@ int cc_ivgen_init(struct cc_drvdata *drv 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 *drv goto out; } - drvdata->ivgen_handle = ivgen_ctx; - return cc_init_iv_sram(drvdata); out: