platform/x86: int3472: Fix double free of GPIO device during unregister

regulator_unregister() already frees the associated GPIO device. On
ThinkPad X9 (Lunar Lake), this causes a double free issue that leads to
random failures when other drivers (typically Intel THC) attempt to
allocate interrupts. The root cause is that the reference count of the
pinctrl_intel_platform module unexpectedly drops to zero when this
driver defers its probe.

This behavior can also be reproduced by unloading the module directly.

Fix the issue by removing the redundant release of the GPIO device
during regulator unregistration.

Cc: stable@vger.kernel.org
Fixes: 1e5d088a52c2 ("platform/x86: int3472: Stop using devm_gpiod_get()")
Signed-off-by: Qiu Wenbo <qiuwenbo@kylinsec.com.cn>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Hans de Goede <hansg@kernel.org>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Link: https://patch.msgid.link/20251028063009.289414-1-qiuwenbo@gnome.org
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/intel/int3472/clk_and_regulator.c b/drivers/platform/x86/intel/int3472/clk_and_regulator.c
index 476ec24d37020a226664236af058426bb43fd6ce..9e052b164a1ab83dc831115b5df6046ce5d70ce8 100644 (file)
--- a/drivers/platform/x86/intel/int3472/clk_and_regulator.c
+++ b/drivers/platform/x86/intel/int3472/clk_and_regulator.c
@@ -245,15 +245,12 @@ int skl_int3472_register_regulator(struct int3472_discrete_device *int3472,
        if (IS_ERR(regulator->rdev))
                return PTR_ERR(regulator->rdev);
 
-       int3472->regulators[int3472->n_regulator_gpios].ena_gpio = gpio;
        int3472->n_regulator_gpios++;
        return 0;
 }
 
 void skl_int3472_unregister_regulator(struct int3472_discrete_device *int3472)
 {
-       for (int i = 0; i < int3472->n_regulator_gpios; i++) {
+       for (int i = 0; i < int3472->n_regulator_gpios; i++)
                regulator_unregister(int3472->regulators[i].rdev);
-               gpiod_put(int3472->regulators[i].ena_gpio);
-       }
 }

diff --git a/include/linux/platform_data/x86/int3472.h b/include/linux/platform_data/x86/int3472.h
index 1571e9157fa50b45bd54b904eaff70fd562a0aa7..b1b837583d5442124ce73a8e7388066df4d7a08a 100644 (file)
--- a/include/linux/platform_data/x86/int3472.h
+++ b/include/linux/platform_data/x86/int3472.h
@@ -100,7 +100,6 @@ struct int3472_gpio_regulator {
        struct regulator_consumer_supply supply_map[GPIO_REGULATOR_SUPPLY_MAP_COUNT * 2];
        char supply_name_upper[GPIO_SUPPLY_NAME_LENGTH];
        char regulator_name[GPIO_REGULATOR_NAME_LENGTH];
-       struct gpio_desc *ena_gpio;
        struct regulator_dev *rdev;
        struct regulator_desc rdesc;
 };