Skip to contentSkip to conversation

FAILED: patch "[PATCH] platform/x86: lenovo-wmi-other: Zero initialize WMI arguments" failed to apply to 6.18-stable tree

PATCH [email protected] 1 participant 1 message May 20

Subsystems (3)
Stable branch x86 platform drivers Lenovo drivers
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x 816fbd5dacee977ca56bab79bf97f71f2f7ac24e
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026052001-striving-endocrine-d192@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^..

Possible dependencies:

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 816fbd5dacee977ca56bab79bf97f71f2f7ac24e Mon Sep 17 00:00:00 2001
From: "Derek J. Clark" <[email protected]>
Date: Sun, 10 May 2026 04:25:34 +0000
Subject: [PATCH] platform/x86: lenovo-wmi-other: Zero initialize WMI arguments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds explicit initialization of wmi_method_args_32 declarations with zero values to prevent uninitialized data from being sent to the device BIOS when passed.

No functional change intended.

Reviewed-by Mark Pearson <[email protected]>
Fixes 22024ac5366f ("platform/x86: Add Lenovo Gamezone WMI Driver")
Fixes edc4b183b794 ("platform/x86: Add Lenovo Other Mode WMI Driver")
Reported-by Rong Zhang <[email protected]>
Closes https://lore.kernel.org/platform-driver-x86/[email protected]/ open here
Cc [email protected]
Reviewed-by Rong Zhang <[email protected]>
Tested-by Rong Zhang <[email protected]>
Signed-off-by Derek J. Clark <[email protected]>
Link https://patch.msgid.link/[email protected] open here
Reviewed-by Ilpo Järvinen <[email protected]>
Signed-off-by Ilpo Järvinen <[email protected]>
drivers/platform/x86/lenovo/wmi-gamezone.c +1 -1
index c7fe7e3c9f17..098239c9311a 100644
@@ -201,7 +201,7 @@ static int lwmi_gz_profile_set(struct device *dev,
 			       enum platform_profile_option profile)
 {
 	struct lwmi_gz_priv *priv = dev_get_drvdata(dev);
-	struct wmi_method_args_32 args;
+	struct wmi_method_args_32 args = {};
 	enum thermal_mode mode;
 	int ret;
drivers/platform/x86/lenovo/wmi-other.c +3 -3
index 70fcb8406c27..c1b429269f89 100644
@@ -166,7 +166,7 @@ MODULE_PARM_DESC(relax_fan_constraint,
  */
 static int lwmi_om_fan_get_set(struct lwmi_om_priv *priv, int channel, u32 *val, bool set)
 {
-	struct wmi_method_args_32 args;
+	struct wmi_method_args_32 args = {};
 	u32 method_id, retval;
 	int err;
 

@@ -775,7 +775,7 @@ static ssize_t attr_current_value_store(struct kobject *kobj,
 					struct tunable_attr_01 *tunable_attr)
 {
 	struct lwmi_om_priv *priv = dev_get_drvdata(tunable_attr->dev);
-	struct wmi_method_args_32 args;
+	struct wmi_method_args_32 args = {};
 	struct capdata01 capdata;
 	enum thermal_mode mode;
 	u32 attribute_id;

@@ -838,7 +838,7 @@ static ssize_t attr_current_value_show(struct kobject *kobj,
 				       struct tunable_attr_01 *tunable_attr)
 {
 	struct lwmi_om_priv *priv = dev_get_drvdata(tunable_attr->dev);
-	struct wmi_method_args_32 args;
+	struct wmi_method_args_32 args = {};
 	enum thermal_mode mode;
 	u32 attribute_id;
 	int retval;