Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp367430pxb; Tue, 2 Feb 2021 07:14:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJwi7KOktZroZxHpHT6vY1uo/eKdKVCR4uo1/FT4iq1zKPj2IZ5JXQC3IKklm2t1NgqLr6K+ X-Received: by 2002:aa7:c9c9:: with SMTP id i9mr23945055edt.160.1612278889694; Tue, 02 Feb 2021 07:14:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612278889; cv=none; d=google.com; s=arc-20160816; b=tmORZeEyLpYGvCgm9+1WR7U3Ijv+sR5By9DRgzJnGV+tWKoZwiNQ/yMDmFJjRTrAl9 x+xPTOVEMk/bzXv6L4TeTAZ0yxf++GJyJ+G6aRqL/Eb5v4SaFbrY8dtQlmHCSuM8BUgD 0Bc4jiDMN8Cqs5WmK8h4Hoo203wq7Hrpm+RsST1rmpniK39tVyWcYl3mSb3BYNG5JXl7 EtNa2U4JoJWxvoJXrat1DzSGhI1GBrJho75EL65B/VnCLOPoSy+3WL3EYynlzHAgIyet bXOJQoNz9cFbKMNrEklQ5rsPskRtzxH+2B5x1FgSTpWEnmkkn+TOrr+j9dDqtrVgsL3f sY4A== 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=/2yslnrgQYFpr59bUTQ4d2JwEoZzByBy4JHrgFad4eA=; b=K3s56umxT4t24XGFMs82PYUEOjsMu4e/XAK71Cv8kLKc62lNTuSEEzi+4TJKlpyOcd RBvQabF3Wm0jKMDEMlh6eLg3h76px4kVbmrp5rxxhFmQNcNGW5YU8i9NvXqZmFb6aL2q HkuKUqCpZ72vtfdSa9sn6K+EL3+FIn7f8Bt6Xhc7A7vyKMaxT7s1qEGqsaYuaQ0k9OaW Kk02dGKe4/zYkCUfJbCSzkSTNQMd6oiXnOdV/QY4URKxosYdO3uzmjakfV4EAD5k/PDp L4UT6hqXZlf7f+5mJVlHx+IC4iZ+B0Qtt/5s9rwy/R+BM0AEzYSymwderrVcq2V6JpIZ PHJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=C9r0HRlM; 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 o23si4317711ejc.395.2021.02.02.07.14.24; Tue, 02 Feb 2021 07:14:49 -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=C9r0HRlM; 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 S235028AbhBBPMg (ORCPT + 99 others); Tue, 2 Feb 2021 10:12:36 -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 S234060AbhBBPLb (ORCPT ); Tue, 2 Feb 2021 10:11:31 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6F22E64F6A; Tue, 2 Feb 2021 15:06:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278397; bh=PZkgaS6zU3kWPQvzWpKAbL1NUiXHw96lH5K6n34oUpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C9r0HRlMOcNe9bTOpmS3/83MgMJ+WCCL0HE6DvPr3CctuodtD4HLobQVJoH9GDAeX btQ3dPZjmjbiiHpsyA+SzuYvGYJIHFyXsVvbz2Do/sE8oRWhQL5sP2aMBdntP4UlZE 5oFQLgLZc+B85gsfOG/fDRVpl+a/yahqj+lQroUAc8hm0eXe1S3LPq8ksnAHUIoHp7 BCes0qkzZdO7UPW5Yr2mqT+qnOmiNtoTbgGEnnMY1uW6OHvq75vqRfctaI+17geoKs CDoZ78JdZpfI7972MHEjt16x7uKdxMzt5Micg735LC3ACDd97Cztz/LFBhVrP1+1jx 9SfRxCoJs/4+A== 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.10 16/25] iwlwifi: pcie: fix context info memory leak Date: Tue, 2 Feb 2021 10:06:06 -0500 Message-Id: <20210202150615.1864175-16-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150615.1864175-1-sashal@kernel.org> References: <20210202150615.1864175-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 5512e3c630c31..2078b7b0bb7f6 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c @@ -236,8 +236,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); @@ -279,6 +281,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