diff options
| author | Armin Wolf <W_Armin@gmx.de> | 2024-03-27 22:45:24 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2024-04-08 15:22:23 +0200 |
| commit | 10eba55febd4784cf54bbb411636f3929723bfc0 (patch) | |
| tree | 8d8924428a7e8da6cd4d3435b3a637aa3220a733 | |
| parent | 83cfe6d8b6b986d430941d22797ca636a6789ba9 (diff) | |
platform/x86: quickstart: Fix race condition when reporting input event
Since commit e2ffcda16290 ("ACPI: OSL: Allow Notify () handlers to run
on all CPUs"), the ACPI core allows multiple notify calls to be active
at the same time. This means that two instances of quickstart_notify()
running at the same time can mess which each others input sequences.
Fix this by protecting the input sequence with a mutex.
Compile-tested only.
Fixes: afd66f2a739e ("platform/x86: Add ACPI quickstart button (PNP0C32) driver")
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20240327214524.123935-1-W_Armin@gmx.de
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | drivers/platform/x86/quickstart.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/platform/x86/quickstart.c b/drivers/platform/x86/quickstart.c index f686942662cc..df496c7e7171 100644 --- a/drivers/platform/x86/quickstart.c +++ b/drivers/platform/x86/quickstart.c @@ -18,6 +18,7 @@ #include <linux/input/sparse-keymap.h> #include <linux/mod_devicetable.h> #include <linux/module.h> +#include <linux/mutex.h> #include <linux/platform_device.h> #include <linux/pm_wakeup.h> #include <linux/printk.h> @@ -38,6 +39,7 @@ struct quickstart_data { struct device *dev; + struct mutex input_lock; /* Protects input sequence during notify */ struct input_dev *input_device; char input_name[32]; char phys[32]; @@ -76,7 +78,10 @@ static void quickstart_notify(acpi_handle handle, u32 event, void *context) switch (event) { case QUICKSTART_EVENT_RUNTIME: + mutex_lock(&data->input_lock); sparse_keymap_report_event(data->input_device, 0x1, 1, true); + mutex_unlock(&data->input_lock); + acpi_bus_generate_netlink_event(DRIVER_NAME, dev_name(data->dev), event, 0); break; default: @@ -150,6 +155,13 @@ static void quickstart_notify_remove(void *context) acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, quickstart_notify); } +static void quickstart_mutex_destroy(void *data) +{ + struct mutex *lock = data; + + mutex_destroy(lock); +} + static int quickstart_probe(struct platform_device *pdev) { struct quickstart_data *data; @@ -168,6 +180,11 @@ static int quickstart_probe(struct platform_device *pdev) data->dev = &pdev->dev; dev_set_drvdata(&pdev->dev, data); + mutex_init(&data->input_lock); + ret = devm_add_action_or_reset(&pdev->dev, quickstart_mutex_destroy, &data->input_lock); + if (ret < 0) + return ret; + /* * We have to initialize the device wakeup before evaluating GHID because * doing so will notify the device if the button was used to wake the machine |