Skip to content

Commit

Permalink
ACPICA: Namespace: Properly null terminate objects detached from a na…
Browse files Browse the repository at this point in the history
…mespace node

Fixes a bug exposed by an ACPICA unit test around the
acpi_attach_data()/acpi_detach_data() APIs where the failure to null
terminate a detached object led to the creation of a circular linked list
(and infinite looping) when the object is reattached.

Reported in acpica bugzilla #1063

Link: https://bugs.acpica.org/show_bug.cgi?id=1063
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Cc: 3.15+ <stable@vger.kernel.org> # 3.15+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
David E. Box authored and Rafael J. Wysocki committed Jul 8, 2014
1 parent ce5eb07 commit e23d9b8
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions drivers/acpi/acpica/nsobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,17 @@ void acpi_ns_detach_object(struct acpi_namespace_node *node)
}
}

/*
* Detach the object from any data objects (which are still held by
* the namespace node)
*/

if (obj_desc->common.next_object &&
((obj_desc->common.next_object)->common.type ==
ACPI_TYPE_LOCAL_DATA)) {
obj_desc->common.next_object = NULL;
}

/* Reset the node type to untyped */

node->type = ACPI_TYPE_ANY;
Expand Down

0 comments on commit e23d9b8

Please sign in to comment.