ACPI / SBS: Fix rare oops when removing modules

There was a small race when removing the sbshc module where
smbus_alarm() had queued acpi_smbus_callback() for deferred execution
but it hadn't been run yet, so that when it did run hc had been freed
and the module unloaded, resulting in an invalid paging request.

A similar race existed when removing the sbs module with regards to
acpi_sbs_callback() (which is called from acpi_smbus_callback()).

We therefore need to ensure no callbacks are pending or executing before
the cleanups are done and the modules are removed.

Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Ronald Tschalär 2018-09-30 19:53:13 -07:00 коммит произвёл Rafael J. Wysocki
Родитель ca1721c5be
Коммит 757c968c44
2 изменённых файлов: 3 добавлений и 0 удалений

Просмотреть файл

@ -1129,6 +1129,7 @@ void acpi_os_wait_events_complete(void)
flush_workqueue(kacpid_wq); flush_workqueue(kacpid_wq);
flush_workqueue(kacpi_notify_wq); flush_workqueue(kacpi_notify_wq);
} }
EXPORT_SYMBOL(acpi_os_wait_events_complete);
struct acpi_hp_work { struct acpi_hp_work {
struct work_struct work; struct work_struct work;

Просмотреть файл

@ -196,6 +196,7 @@ int acpi_smbus_unregister_callback(struct acpi_smb_hc *hc)
hc->callback = NULL; hc->callback = NULL;
hc->context = NULL; hc->context = NULL;
mutex_unlock(&hc->lock); mutex_unlock(&hc->lock);
acpi_os_wait_events_complete();
return 0; return 0;
} }
@ -292,6 +293,7 @@ static int acpi_smbus_hc_remove(struct acpi_device *device)
hc = acpi_driver_data(device); hc = acpi_driver_data(device);
acpi_ec_remove_query_handler(hc->ec, hc->query_bit); acpi_ec_remove_query_handler(hc->ec, hc->query_bit);
acpi_os_wait_events_complete();
kfree(hc); kfree(hc);
device->driver_data = NULL; device->driver_data = NULL;
return 0; return 0;