From: "Derek J. Clark" <derekjohn.clark@gmail.com>
To: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Hans de Goede" <hansg@kernel.org>
Cc: "Mark Pearson" <mpearson-lenovo@squebb.ca>,
"Armin Wolf" <W_Armin@gmx.de>, "Jonathan Corbet" <corbet@lwn.net>,
"Rong Zhang" <i@rong.moe>, "Kurt Borja" <kuurtb@gmail.com>,
"Derek J . Clark" <derekjohn.clark@gmail.com>,
"Pierre-Loup A . Griffais" <pgriffais@valvesoftware.com>,
"Nícolas F . R . A . Prado" <nfraprado@collabora.com>,
marshall@shzj.cc, hyacinth@shzj.cc,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH v11 01/15] platform/x86: lenovo-wmi-helpers: Fix memory leak in lwmi_dev_evaluate_int()
Date: Thu, 7 May 2026 18:04:53 +0000 [thread overview]
Message-ID: <20260507180507.912966-2-derekjohn.clark@gmail.com> (raw)
In-Reply-To: <20260507180507.912966-1-derekjohn.clark@gmail.com>
From: Rong Zhang <i@rong.moe>
lwmi_dev_evaluate_int() leaks output.pointer when retval == NULL (found
by sashiko.dev [1]).
Fix it by moving `ret_obj = output.pointer' outside of the `if (retval)'
block so that it is always freed by the __free cleanup callback.
No functional change intended.
Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Fixes: e521d16e76cd ("platform/x86: Add lenovo-wmi-helpers")
Cc: stable@vger.kernel.org
Link: https://sashiko.dev/#/patchset/20260331181208.421552-1-derekjohn.clark%40gmail.com [1]
Signed-off-by: Rong Zhang <i@rong.moe>
Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
---
drivers/platform/x86/lenovo/wmi-helpers.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/lenovo/wmi-helpers.c b/drivers/platform/x86/lenovo/wmi-helpers.c
index 7379defac500..018d7642e2bd 100644
--- a/drivers/platform/x86/lenovo/wmi-helpers.c
+++ b/drivers/platform/x86/lenovo/wmi-helpers.c
@@ -46,7 +46,6 @@ int lwmi_dev_evaluate_int(struct wmi_device *wdev, u8 instance, u32 method_id,
unsigned char *buf, size_t size, u32 *retval)
{
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
- union acpi_object *ret_obj __free(kfree) = NULL;
struct acpi_buffer input = { size, buf };
acpi_status status;
@@ -55,8 +54,9 @@ int lwmi_dev_evaluate_int(struct wmi_device *wdev, u8 instance, u32 method_id,
if (ACPI_FAILURE(status))
return -EIO;
+ union acpi_object *ret_obj __free(kfree) = output.pointer;
+
if (retval) {
- ret_obj = output.pointer;
if (!ret_obj)
return -ENODATA;
--
2.53.0
next prev parent reply other threads:[~2026-05-07 18:05 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-07 18:04 [PATCH v11 00/15] lenovo-wmi: Add fixes and enhancement Derek J. Clark
2026-05-07 18:04 ` Derek J. Clark [this message]
2026-05-07 18:04 ` [PATCH v11 02/15] platform/x86: lenovo-wmi-other: Balance IDA id allocation and free Derek J. Clark
2026-05-07 18:04 ` [PATCH v11 03/15] platform/x86: lenovo-wmi-other: Balance component bind and unbind Derek J. Clark
2026-05-07 18:04 ` [PATCH v11 04/15] platform/x86: lenovo-wmi-other: Zero initialize WMI arguments Derek J. Clark
2026-05-08 14:22 ` Ilpo Järvinen
2026-05-07 18:04 ` [PATCH v11 05/15] platform/x86: lenovo-wmi-other: Fix tunable_attr_01 struct members Derek J. Clark
2026-05-08 14:32 ` Ilpo Järvinen
2026-05-07 18:04 ` [PATCH v11 06/15] platform/x86: lenovo: Decouple lenovo-wmi-gamezone and lenovo-wmi-other Derek J. Clark
2026-05-07 18:04 ` [PATCH v11 07/15] platform/x86: lenovo-wmi-helpers: Move gamezone enums to wmi-helpers Derek J. Clark
2026-05-08 14:21 ` Ilpo Järvinen
2026-05-08 14:30 ` Derek J. Clark
2026-05-07 18:05 ` [PATCH v11 08/15] platform/x86: lenovo-wmi-other: Add lwmi_attr_id() function Derek J. Clark
2026-05-08 14:25 ` Ilpo Järvinen
2026-05-07 18:05 ` [PATCH v11 09/15] platform/x86: lenovo-wmi-other: Limit adding attributes to supported devices Derek J. Clark
2026-05-08 14:28 ` Ilpo Järvinen
2026-05-07 18:05 ` [PATCH v11 10/15] platform/x86: lenovo-wmi-other: Add missing CPU tunable attributes Derek J. Clark
2026-05-07 18:05 ` [PATCH v11 11/15] platform/x86: lenovo-wmi-other: Add GPU " Derek J. Clark
2026-05-07 18:05 ` [PATCH v11 12/15] platform/x86: lenovo-wmi-other: Rename LWMI_OM_FW_ATTR_BASE_PATH Derek J. Clark
2026-05-07 18:05 ` [PATCH v11 13/15] platform/x86: lenovo-wmi-other: Add WMI battery charge limiting Derek J. Clark
2026-05-08 14:52 ` Ilpo Järvinen
2026-05-08 15:08 ` Derek J. Clark
2026-05-08 15:23 ` Ilpo Järvinen
2026-05-08 15:36 ` Derek J. Clark
2026-05-07 18:05 ` [PATCH v11 14/15] platform/x86: lenovo-wmi-helpers: Add helper for creating per-device debugfs dir Derek J. Clark
2026-05-07 18:05 ` [PATCH v11 15/15] platform/x86: lenovo-wmi-capdata: Add debugfs file for dumping capdata Derek J. Clark
2026-05-08 15:08 ` Ilpo Järvinen
2026-05-08 17:41 ` Derek John Clark
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260507180507.912966-2-derekjohn.clark@gmail.com \
--to=derekjohn.clark@gmail.com \
--cc=W_Armin@gmx.de \
--cc=corbet@lwn.net \
--cc=hansg@kernel.org \
--cc=hyacinth@shzj.cc \
--cc=i@rong.moe \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=kuurtb@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marshall@shzj.cc \
--cc=mpearson-lenovo@squebb.ca \
--cc=nfraprado@collabora.com \
--cc=pgriffais@valvesoftware.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox