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 BEF9019E98D; Sun, 26 Jan 2025 15:01:43 +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=1737903703; cv=none; b=T0s7IFHDGL/Y7f/D7+iJN2cQEYLmP+GTkjEhhHZ+YX+RzCHYtGsN/Zj8PEE3L5Np6lSa8pCF+bd+/GUTSeF8Hbz5oNvNpzNZxaBV75I1c3HkSzXcMj4NCrJwOTrc2QLDv3BEZhFE/+HHCBNAW3VQpEdUMuF7wlxP5wzzcprWogQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737903703; c=relaxed/simple; bh=gZXa/QlzUTnZNzVf8+mlAdBz4gVYIciL2oZ+rzjJKkE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IJKjlDz9DAAnq5hFahkyBZKWccsB4V3fGQwofn2pbphVbGM4TzmZ9ZK9NamFVAeU3EYUm3BYZ63sTMn/EU+HIWhDUvlHij6MiWVZbW6fMsf9DNeAmsK7ijEwmwTZoY+z+wLCHMl9Fj+9vntOrBjPToGfVKz7GlpE6IBjckKlAVA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p429NvaT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="p429NvaT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68E41C4CED3; Sun, 26 Jan 2025 15:01:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737903703; bh=gZXa/QlzUTnZNzVf8+mlAdBz4gVYIciL2oZ+rzjJKkE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p429NvaTIOnqVQ1h+RDVNIY8l8MxRzYPLQVaPnUemDhx3QfXn+Y1F/vGGOxthtk26 hOS+ESQHtLSv89WCxgVgNNBXcQaiOwpJIjV4mALSjugmZ051vb6DdaiBdm7ifGnWMt ZUtsOsJ1upQhJlR72zA4WaL36QfPDAHWlv8+u3Z8aR1nzCs2i7+EuIU9jjHeuxZriM /OMG9GR8GbQpcDH0EseG97J6a3SQImvRhTN4eEut0c9L3+TfiZ5c5d5x2gONySFOak eBlvCvMQxQDQkJP3uz50eqzP6DeOQ4Vi9MUsGSYGiNU0Nc3Wx2aET5uFUPNB7PvI0u Zj3FEnzT1BLwg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Miri Korenblit , Johannes Berg , Sasha Levin , kvalo@kernel.org, gregory.greenman@intel.com, pagadala.yesu.anjaneyulu@intel.com, dan.carpenter@linaro.org, somashekhar.puttagangaiah@intel.com, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.13 21/35] wifi: iwlwifi: avoid memory leak Date: Sun, 26 Jan 2025 10:00:15 -0500 Message-Id: <20250126150029.953021-21-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250126150029.953021-1-sashal@kernel.org> References: <20250126150029.953021-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.13 Content-Transfer-Encoding: 8bit From: Miri Korenblit [ Upstream commit 80e96206a3ef348fbd658d98f2f43149c36df8bc ] A caller of iwl_acpi_get_dsm_object must free the returned object. iwl_acpi_get_dsm_integer returns immediately without freeing it if the expected size is more than 8 bytes. Fix that. Note that with the current code this will never happen, since the caller of iwl_acpi_get_dsm_integer already checks that the expected size if either 1 or 4 bytes, so it can't exceed 8 bytes. While at it, print the DSM value instead of the return value, as this was the intention in the first place. Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20241228223206.bf61eaab99f8.Ibdc5df02f885208c222456d42c889c43b7e3b2f7@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c index 0bc32291815e1..a26c5573d2091 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c @@ -108,7 +108,7 @@ static int iwl_acpi_get_dsm_integer(struct device *dev, int rev, int func, size_t expected_size) { union acpi_object *obj; - int ret = 0; + int ret; obj = iwl_acpi_get_dsm_object(dev, rev, func, NULL, guid); if (IS_ERR(obj)) { @@ -123,8 +123,10 @@ static int iwl_acpi_get_dsm_integer(struct device *dev, int rev, int func, } else if (obj->type == ACPI_TYPE_BUFFER) { __le64 le_value = 0; - if (WARN_ON_ONCE(expected_size > sizeof(le_value))) - return -EINVAL; + if (WARN_ON_ONCE(expected_size > sizeof(le_value))) { + ret = -EINVAL; + goto out; + } /* if the buffer size doesn't match the expected size */ if (obj->buffer.length != expected_size) @@ -145,8 +147,9 @@ static int iwl_acpi_get_dsm_integer(struct device *dev, int rev, int func, } IWL_DEBUG_DEV_RADIO(dev, - "ACPI: DSM method evaluated: func=%d, ret=%d\n", - func, ret); + "ACPI: DSM method evaluated: func=%d, value=%lld\n", + func, *value); + ret = 0; out: ACPI_FREE(obj); return ret; -- 2.39.5