openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'acpi-scan' 

* acpi-scan:
  ACPI / scan: Fix NULL pointer dereference in acpi_companion_match()
This commit is contained in:
Rafael J. Wysocki 2015-04-14 12:53:36 +02:00
parent 0fe0952b21 5f2e3274e5
commit 03aecbcd71
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/acpi/scan.c
View File

@ -247,6 +247,7 @@ static int create_of_modalias(struct acpi_device *acpi_dev, char *modalias,
static struct acpi_device *acpi_companion_match(const struct device *dev) static struct acpi_device *acpi_companion_match(const struct device *dev)
{ {
struct acpi_device *adev; struct acpi_device *adev;
struct mutex *physical_node_lock;
adev = ACPI_COMPANION(dev); adev = ACPI_COMPANION(dev);
if (!adev) if (!adev)
@ -255,7 +256,8 @@ static struct acpi_device *acpi_companion_match(const struct device *dev)
if (list_empty(&adev->pnp.ids)) if (list_empty(&adev->pnp.ids))
return NULL; return NULL;
mutex_lock(&adev->physical_node_lock); physical_node_lock = &adev->physical_node_lock;
mutex_lock(physical_node_lock);
if (list_empty(&adev->physical_node_list)) { if (list_empty(&adev->physical_node_list)) {
adev = NULL; adev = NULL;
} else { } else {
@ -266,7 +268,7 @@ static struct acpi_device *acpi_companion_match(const struct device *dev)
if (node->dev != dev) if (node->dev != dev)
adev = NULL; adev = NULL;
} }
mutex_unlock(&adev->physical_node_lock); mutex_unlock(physical_node_lock);
return adev; return adev;
} }