From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 07FDF31CA57; Mon, 18 Aug 2025 13:02:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755522150; cv=none; b=B2VqDQIFgBeAhg5cuvBtvNSA+UOIkux0BpL76bclZgqoCE/e+T460wO4YtHnoQuBsQOEnvOBctsOdn1zZ48f3PcB6CrmPFKOO9GPiWNTbn1uTlu/sWX70ziCqqk2Ox8KN/yqlzn7uJoMPLUMy7fuxiVibuzyBw4ha+3PSyTvKa0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755522150; c=relaxed/simple; bh=VXJBUvqhP2CjZyGjK34ZrguDUHwlSggESKnJ+zur8ME=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BwWS/v663e7FHdxnOYuyhDerZBGyQ86gwC0fQgGALM45UYF5i+9Bu2qMbqa7ipPGds9zjt27uhstKmkkJfAorBa4CbPpqwLFXYR2clt2K10/sg99WHo6ICtxLhdhux8OpRcRFKaxlnZtyBFsO0+6dDcLS+S0rP7JeOG3mtZ2lSk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OxpioZyq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OxpioZyq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 068E4C4CEEB; Mon, 18 Aug 2025 13:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755522149; bh=VXJBUvqhP2CjZyGjK34ZrguDUHwlSggESKnJ+zur8ME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OxpioZyqWoTMwaEUh35dNqkFfTNrbsK0WsrpFoYdONAuVYCSo/HhWuXdkuKwYrSCB YnD54bN8UMYdP8vVwNHMjj6ttzZaCUqCiT89SKOc/b2fcd4B4Kn+60gwL5RfdsnAHj wWWFu+d5I4lv59XKME61XEwy+S9XzmyLH2oTq9wc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pagadala Yesu Anjaneyulu , Miri Korenblit , Sasha Levin Subject: [PATCH 6.12 231/444] wifi: iwlwifi: fw: Fix possible memory leak in iwl_fw_dbg_collect Date: Mon, 18 Aug 2025 14:44:17 +0200 Message-ID: <20250818124457.501690332@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124448.879659024@linuxfoundation.org> References: <20250818124448.879659024@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pagadala Yesu Anjaneyulu [ Upstream commit cc8d9cbf269dab363c768bfa9312265bc807fca5 ] Ensure descriptor is freed on error to avoid memory leak. Signed-off-by: Pagadala Yesu Anjaneyulu Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20250611222325.8158d15ec866.Ifa3e422c302397111f20a16da7509e6574bc19e3@changeid Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c index cd284767ff4b..385755af8237 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -2955,6 +2955,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt, struct iwl_fw_dump_desc *desc; unsigned int delay = 0; bool monitor_only = false; + int ret; if (trigger) { u16 occurrences = le16_to_cpu(trigger->occurrences) - 1; @@ -2985,7 +2986,11 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt, desc->trig_desc.type = cpu_to_le32(trig); memcpy(desc->trig_desc.data, str, len); - return iwl_fw_dbg_collect_desc(fwrt, desc, monitor_only, delay); + ret = iwl_fw_dbg_collect_desc(fwrt, desc, monitor_only, delay); + if (ret) + kfree(desc); + + return ret; } IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect); -- 2.39.5