diff options
author | Bob Moore <robert.moore@intel.com> | 2008-07-03 22:41:41 -0400 |
---|---|---|
committer | Andi Kleen <ak@linux.intel.com> | 2008-08-14 20:11:59 -0400 |
commit | 2843ae7734075f5d7072cf1230758bf8cf840af7 (patch) | |
tree | c24445a6bcaab163b60f0557c8acdb3f1b3777b0 | |
parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) |
ACPICA: Fix memory leak when deleting thermal/processor objects
Fixes a possible memory leak when thermal and processor objects
are deleted. Any associated notify handlers (and objects) were
not being deleted. Fiodor Suietov. BZ 506
http://www.acpica.org/bugzilla/show_bug.cgi?id=506
Signed-off-by: Fiodor Suietov <fiodor.f.suietov@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
-rw-r--r-- | drivers/acpi/utilities/utdelete.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c index c5c791a575c9..42609d3a8aa9 100644 --- a/drivers/acpi/utilities/utdelete.c +++ b/drivers/acpi/utilities/utdelete.c | |||
@@ -135,6 +135,10 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object) | |||
135 | obj_pointer = object->package.elements; | 135 | obj_pointer = object->package.elements; |
136 | break; | 136 | break; |
137 | 137 | ||
138 | /* | ||
139 | * These objects have a possible list of notify handlers. | ||
140 | * Device object also may have a GPE block. | ||
141 | */ | ||
138 | case ACPI_TYPE_DEVICE: | 142 | case ACPI_TYPE_DEVICE: |
139 | 143 | ||
140 | if (object->device.gpe_block) { | 144 | if (object->device.gpe_block) { |
@@ -142,9 +146,14 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object) | |||
142 | gpe_block); | 146 | gpe_block); |
143 | } | 147 | } |
144 | 148 | ||
145 | /* Walk the handler list for this device */ | 149 | /*lint -fallthrough */ |
150 | |||
151 | case ACPI_TYPE_PROCESSOR: | ||
152 | case ACPI_TYPE_THERMAL: | ||
153 | |||
154 | /* Walk the notify handler list for this object */ | ||
146 | 155 | ||
147 | handler_desc = object->device.handler; | 156 | handler_desc = object->common_notify.handler; |
148 | while (handler_desc) { | 157 | while (handler_desc) { |
149 | next_desc = handler_desc->address_space.next; | 158 | next_desc = handler_desc->address_space.next; |
150 | acpi_ut_remove_reference(handler_desc); | 159 | acpi_ut_remove_reference(handler_desc); |