[PATCH] acpi: scan: Fix a possible data race in acpi_scan_hotplug_enabled

From: Jia-Ju Bai
Date: Mon May 07 2018 - 23:08:24 EST


The write operation to "hotplug->enabled" is protected by
the lock on line 1760, but the read operation to
this data on line 1755 is not protected by the lock.
Thus, there may exist a data race for "hotplug->enabled".

To fix this data race, the read operation to "hotplug->enabled" is
also protected by the lock.

Signed-off-by: Jia-Ju Bai <baijiaju1990@xxxxxxxxx>
---
drivers/acpi/scan.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 970dd87d347c..e21d7b0f7179 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1752,11 +1752,13 @@ static struct acpi_scan_handler *acpi_scan_match_handler(const char *idstr,

void acpi_scan_hotplug_enabled(struct acpi_hotplug_profile *hotplug, bool val)
{
- if (!!hotplug->enabled == !!val)
- return;
-
mutex_lock(&acpi_scan_lock);

+ if (!!hotplug->enabled == !!val) {
+ mutex_unlock(&acpi_scan_lock);
+ return;
+ }
+
hotplug->enabled = val;

mutex_unlock(&acpi_scan_lock);
--
2.17.0