Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp389976pxb; Tue, 2 Feb 2021 07:43:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJw477ukDZmJ2eotiPoISP5NWaHnNLT0tBUdUn44do+peXcxC0GuiB21jfdzEXS59eSyFLxA X-Received: by 2002:a17:906:cc50:: with SMTP id mm16mr15078760ejb.366.1612280610544; Tue, 02 Feb 2021 07:43:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612280610; cv=none; d=google.com; s=arc-20160816; b=hcomu89kfb239GgyYGD/l64IhTZojsK9jL68LJLLKDbsF12LufXFzz2DlCD9nc+/6Q OCozb5bwqWtAWGbjKb8150DdbXK1h93B+gpt50EeS7QTSKBUJ+pgR5n48jNuyxahSyNs RUtkb/sJXrD75c4medOoEnYVz5h90/aH8CoIAwZp1U+hoRSFBU7OMNnFsDRPU9YablZM Ay47UktucEvH8PdTLSKouvA0PWW12jzTDPaTkWH4NO8iEI8KwPkwoH67uwwNUnrE6ahS gXYfOJro4VZeFzIFmyXmPFht6duQtND9MlKNhgE+uQa111zvDKA/MmAsOCpCb/B8grgH 8FLQ== 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=qJ07gB8dsUZxUWGHk1ucf4E7LLG3LUD+/dMQEdpUG/s=; b=xYubcVlglIK/bOPdpX0uAuRO+7W+rPkUsmTKX1a+40aWyxsC3V3CTJ5aFzrxbuvaB5 XlLGDs1lAMfR2NojsmQU6KRiNfuNz+XeN0UwPhE5EzhFx9C2B9deNx82D1h1T+EPLZpF 5+kSsdhGqjrM2zx+nGB5V6EI94zy00QE0nn1rEAPJ5Ex01G/8z0GwYEvhq807G39ab3d tp4O2PViyfBvev4MhtNbMlCwkA1zYlp2PpKdZ0wn6ZRh/moOGkQHHF8vBfT33EM3AfXq rDl0wOY5htIh8tx7zUwIOIyitGiJZabjb4lyw3e2f/nuS8VPyds3O46TJtjoH7FdVVT6 R2hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="tJ/qQfMe"; 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 j16si12619118ejv.389.2021.02.02.07.43.06; Tue, 02 Feb 2021 07:43:30 -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="tJ/qQfMe"; 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 S235677AbhBBPlo (ORCPT + 99 others); Tue, 2 Feb 2021 10:41:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:39396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235247AbhBBPOk (ORCPT ); Tue, 2 Feb 2021 10:14:40 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9627A64F97; Tue, 2 Feb 2021 15:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278444; bh=jIHY2Onh9Lf4bc+Q7liJg+mnsJDotpo45TN0MWOgu8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tJ/qQfMezLQhCnr1a5WYkxVf4B92oqOwTUd/rW6tSTx8wK9bisuoeROfk4rYdjHyA R7NF+NfpDspkqkYHmd9kuV0xEwblmXUEtcxQJHucEgYcm2R3yFeBAAsIeEDTv4jfxZ lR+iLsVtU2DBWxUvoC1XLzerKAepvN5KgqqcVayUjR7zBAGM6uaIUpsQ0SpAJHgdl4 /m4aRfqlvOvBAjpd34ou/lW0HqAr9A/vjmwNC+MPBWvYfdCmCIYg8w3ZQ54uCcsJzT LAKZn3JsAx/iBYrrMcom16ymnZFx9bqB7BDCaxfqKgNX42NWZWTTYC2uhQq27u2duL gWk6kVzrfwX8w== 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 4.19 07/10] iwlwifi: pcie: fix context info memory leak Date: Tue, 2 Feb 2021 10:07:11 -0500 Message-Id: <20210202150715.1864614-7-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150715.1864614-1-sashal@kernel.org> References: <20210202150715.1864614-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 6783b20d9681b..a1cecf4a0e820 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c @@ -159,8 +159,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); @@ -177,6 +179,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