ACPI: property: Fix error handling in acpi_init_properties()

buf.pointer, memory for storing _DSD data and nodes, was released if either
parsing properties or, as recently added, attaching data node tags failed.
Alas, properties were still left pointing to this memory if parsing
properties were successful but attaching data node tags failed.

Fix this by separating error handling for the two, and leaving properties
intact if data nodes cannot be tagged for a reason or another.

Reported-by: kernel test robot <[email protected]>
Fixes: 1d52f10917a7 ("ACPI: property: Tie data nodes to acpi handles")
Signed-off-by: Sakari Ailus <[email protected]>
[ rjw: Drop unrelated white space change ]
Signed-off-by: Rafael J. Wysocki <[email protected]>

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index d26f630f2a7c21dba582c9fc015338eb49647414..f649ae9645c990c4abc9ff5089477030188c2967 100644 (file)
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -566,11 +566,12 @@ void acpi_init_properties(struct acpi_device *adev)
                                        &adev->data, acpi_fwnode_handle(adev)))
                adev->data.pointer = buf.pointer;
 
-       if (!adev->data.pointer ||
-           !acpi_tie_nondev_subnodes(&adev->data)) {
-               acpi_untie_nondev_subnodes(&adev->data);
+       if (!adev->data.pointer) {
                acpi_handle_debug(adev->handle, "Invalid _DSD data, skipping\n");
                ACPI_FREE(buf.pointer);
+       } else {
+               if (!acpi_tie_nondev_subnodes(&adev->data))
+                       acpi_untie_nondev_subnodes(&adev->data);
        }
 
  out: