Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp398372pxb; Tue, 2 Feb 2021 07:56:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJww4P6s2PAyn9qtEjUXBmERcf1F+dlngEvJW9OimJ/RysLvU5EwsUVV71BX7Y7Qp5tI5pYV X-Received: by 2002:a17:906:3f89:: with SMTP id b9mr22483860ejj.204.1612281383053; Tue, 02 Feb 2021 07:56:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612281383; cv=none; d=google.com; s=arc-20160816; b=cIKq1A9Dbn9n6ybtvyVTMKBFmPiIlxa0j5pnUp81w02QZR+U0UVIa9UKw5LP/8uU3l 9uC0DQlUKEhV/PUQyzjBuMOknBPK9JiSPKnzIM6sd1ZBecOtFGC/YSoY5Dzw8QmIt1Ba diJ31sbtUIZHnoDooFSZdpyHBWt5AEIq0DKLL3eyuIVzXQw/y8Fx2Xn+39bia+HEXC0N ceAIVc4TfWONu+N8dBL+KPZuhzl9ifgDo61XKkqSOspo2dlOpEdKO2sBPVEc8i4QrOoo APQ9PakowMH0rF/eyIOBbL//D4ZuDLvL6+B/fjj5j555GqlFTAXRySKP9H4ABnBiN+3/ efpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NRC6js5Wor6G+geZWclbL2AtE4gz3Y34LQGb0n5es2w=; b=Zi1b145mOLrXo0J026pBIyr9T4jfqUm7jUedxYCYpBYE38+0Voy7KxFo2sXNT09mCB MzcRjTUMRxs/yfaGW4RIJI5TBdlOTIZQI2FVvOi/HdbsLkmoERSqy502xc+ikCPY7LDc DVtP2FLzsiXfqoHIOe3EIa7V10M/h+ExxKYtv58Qs9yySh8ECtSOClNfmC5EP1hQMQ7E MvvvDD3nRh9KhQlNjFkU216Eahfa8yJyNBklQGcD3KCB6lSH8K+P4vmPIJrONVUx3Xpi DzybwS96EsUNzdvdHSUbC2j4RKU75qucl1cAdAlcScvonzk0GTjrJseViUcHLOgAcK/P 2ACQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="MgO/Sd3S"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a12si13032483edk.285.2021.02.02.07.55.58; Tue, 02 Feb 2021 07:56:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-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=k20201202 header.b="MgO/Sd3S"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235565AbhBBPwv (ORCPT + 99 others); Tue, 2 Feb 2021 10:52:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:37236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235084AbhBBPMr (ORCPT ); Tue, 2 Feb 2021 10:12:47 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8B1FD64F84; Tue, 2 Feb 2021 15:07:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278425; bh=CTrKFKFw9wzgKDGrZqscRZtG58ni4CENVIvrkbvqplU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MgO/Sd3SyaZcIM8g3mMifszoy4nnRNWo7IfLdFtCr+X4RVm3E2BMrXaWFstVsLEXn CVLEJP7WFHF5AuR+kSA1kcaKOwCdaShxXpBxmCpXBbszvKt8MR7MRxZwLze6NX7qLW rYUKn+0nNTx5oqAZ/kOe2ZyiDt2L3j80NqPYQfMSdgv1HJEUkHljKiQgaCYEb0OtSW ruqwDBStEbR+RxhLI2LNKPrGNt6SorBqrugmFUYECs9YyV9VONW/diWHE5NVpFMBQX A+7lWiA0OIy6cAtUgJzKsLP0MFcU2OJ0a6rQtANco8zvk4jK64ibF4he2ksWBNbZD1 je6TR/3OLTrUw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Luca Coelho , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 11/17] iwlwifi: pcie: fix context info memory leak Date: Tue, 2 Feb 2021 10:06:45 -0500 Message-Id: <20210202150651.1864426-11-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150651.1864426-1-sashal@kernel.org> References: <20210202150651.1864426-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg [ Upstream commit 2d6bc752cc2806366d9a4fd577b3f6c1f7a7e04e ] If the image loader allocation fails, we leak all the previously allocated memory. Fix this. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/iwlwifi.20210115130252.97172cbaa67c.I3473233d0ad01a71aa9400832fb2b9f494d88a11@changeid Signed-off-by: Sasha Levin --- .../net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c index 7a5b024a6d384..eab159205e48b 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c @@ -164,8 +164,10 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, /* Allocate IML */ iml_img = dma_alloc_coherent(trans->dev, trans->iml_len, &trans_pcie->iml_dma_addr, GFP_KERNEL); - if (!iml_img) - return -ENOMEM; + if (!iml_img) { + ret = -ENOMEM; + goto err_free_ctxt_info; + } memcpy(iml_img, trans->iml, trans->iml_len); @@ -207,6 +209,11 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, return 0; +err_free_ctxt_info: + dma_free_coherent(trans->dev, sizeof(*trans_pcie->ctxt_info_gen3), + trans_pcie->ctxt_info_gen3, + trans_pcie->ctxt_info_dma_addr); + trans_pcie->ctxt_info_gen3 = NULL; err_free_prph_info: dma_free_coherent(trans->dev, sizeof(*prph_info), -- 2.27.0