Skip to content

Commit

Permalink
ACPI / scan: Fix NULL pointer dereference in acpi_companion_match()
Browse files Browse the repository at this point in the history
Commit e1acdeb "ACPI / scan: Simplify acpi_match_device()"
introduced code that may lead to a NULL pointer dereference when
trying to unlock a mutex.  Fix that.

Fixes: e1acdeb "ACPI / scan: Simplify acpi_match_device()"
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
rafaeljw committed Apr 13, 2015
1 parent 8765c5b commit 5f2e327
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/acpi/scan.c
Expand Up @@ -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)
{
struct acpi_device *adev;
struct mutex *physical_node_lock;

adev = ACPI_COMPANION(dev);
if (!adev)
Expand All @@ -255,7 +256,8 @@ static struct acpi_device *acpi_companion_match(const struct device *dev)
if (list_empty(&adev->pnp.ids))
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)) {
adev = NULL;
} else {
Expand All @@ -266,7 +268,7 @@ static struct acpi_device *acpi_companion_match(const struct device *dev)
if (node->dev != dev)
adev = NULL;
}
mutex_unlock(&adev->physical_node_lock);
mutex_unlock(physical_node_lock);

return adev;
}
Expand Down

0 comments on commit 5f2e327

Please sign in to comment.