Skip to contentSkip to conversation

ACPI: PAD: xen: Check ACPI_COMPANION() against NULL

PATCH In review Rafael J. Wysocki 2 participants 2 messages May 12

Subsystems (2)
lore
Share & tools
lore

Rafael J. Wysocki

author maintainer
#0 lore raw

PATCH 1/1 ACPI: PAD: xen: Check ACPI_COMPANION() against NULL

From: "Rafael J. Wysocki" <[email protected]>

Every platform driver can be forced to match a device that doesn't match its list of device IDs because of device_match_driver_override(), so platform drivers that rely on the existence of a device's ACPI companion object need to verify its presence.

Accordingly, add a requisite ACPI_COMPANION() check against NULL to the Xen variant of the ACPI processor aggregator device (PAD) driver.

Fixes 112b2f978afe ("ACPI: PAD: xen: Convert to a platform driver")
---
 drivers/xen/xen-acpi-pad.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/xen/xen-acpi-pad.c +5 -1
@@ -110,9 +110,13 @@ static void acpi_pad_notify(acpi_handle
 
 static int acpi_pad_probe(struct platform_device *pdev)
 {
-	struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
+	struct acpi_device *device;
 	acpi_status status;
 
+	device = ACPI_COMPANION(&pdev->dev);
+	if (!device)
+		return -ENODEV;
+
 	strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME);
 	strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS);
 
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Rafael J. Wysocki

From: "Rafael J. Wysocki" <[email protected]>

Every platform driver can be forced to match a device that doesn't match its list of device IDs because of device_match_driver_override(), so platform drivers that rely on the existence of a device's ACPI companion object need to verify its presence.

Quoted 5 lines

Accordingly, add a requisite ACPI_COMPANION() check against NULL to the Xen variant of the ACPI processor aggregator device (PAD) driver.

Fixes 112b2f978afe ("ACPI: PAD: xen: Convert to a platform driver")

Juergen