]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
platform/x86: alienware-wmi-wmax: Fix uninitialized variable due to bad error handling
authorKurt Borja <kuurtb@gmail.com>
Wed, 16 Apr 2025 16:50:23 +0000 (13:50 -0300)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Thu, 17 Apr 2025 11:16:16 +0000 (14:16 +0300)
wmax_thermal_information() may also return -ENOMSG, which would leave
`id` uninitialized in thermal_profile_probe.

Reorder and modify logic to catch all errors.

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/Z_-KVqNbD9ygvE2X@stanley.mountain
Fixes: 27e9e6339896 ("platform/x86: alienware-wmi: Refactor thermal control methods")
Signed-off-by: Kurt Borja <kuurtb@gmail.com>
Link: https://lore.kernel.org/r/20250416-smatch-fix-v1-1-35491b462d8f@gmail.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/dell/alienware-wmi-wmax.c

index 0c3be03385f899b1b1f678a9d111eb610cedda0a..3f9e1e986ecf0a906ca16b85fd60e675f1885171 100644 (file)
@@ -655,12 +655,10 @@ static int thermal_profile_probe(void *drvdata, unsigned long *choices)
        for (u32 i = 0; i < sys_desc[3]; i++) {
                ret = wmax_thermal_information(priv->wdev, WMAX_OPERATION_LIST_IDS,
                                               i + first_mode, &out_data);
-
-               if (ret == -EIO)
-                       return ret;
-
                if (ret == -EBADRQC)
                        break;
+               if (ret)
+                       return ret;
 
                if (!is_wmax_thermal_code(out_data))
                        continue;