Skip to content

Commit

Permalink
ACPICA: Fix possible memory leak, error exit path
Browse files Browse the repository at this point in the history
Fixed two possible memory leaks in the error exit paths of
acpi_ut_update_objerct_reference() and
acpi_ut_walk_package_tree()
These functions are similar in that they use a stack of state objects in
order to eliminate recursion. The stack must be fully deallocated
if an error occurs.

http://www.acpica.org/bugzilla/show_bug.cgi?id=383

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Lin Ming authored and Len Brown committed Oct 23, 2008
1 parent c35def2 commit cf058bd
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/acpi/utilities/utdelete.c
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,13 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
ACPI_EXCEPTION((AE_INFO, status,
"Could not update object reference count"));

/* Free any stacked Update State objects */

while (state_list) {
state = acpi_ut_pop_generic_state(&state_list);
acpi_ut_delete_generic_state(state);
}

return_ACPI_STATUS(status);
}

Expand Down
9 changes: 9 additions & 0 deletions drivers/acpi/utilities/utmisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -995,6 +995,15 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
state->pkg.
this_target_obj, 0);
if (!state) {

/* Free any stacked Update State objects */

while (state_list) {
state =
acpi_ut_pop_generic_state
(&state_list);
acpi_ut_delete_generic_state(state);
}
return_ACPI_STATUS(AE_NO_MEMORY);
}
}
Expand Down

0 comments on commit cf058bd

Please sign in to comment.