ACPICA: Operation region support: Never free the handler "context" pointer.
This change removes some dangerous code that attempts to free the handler context pointer in some (rare) circumstances. The owner of the handler owns this pointer and the ACPICA code should never touch it. Although not seen to be an issue in any kernel, it did show up as a problem under AcpiExec. Also, set the internal storage field for the context pointer to zero when the region is deactivated, simply for sanity. David Box. Signed-off-by: David E. Box <david.e.box@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Reviewed-by: Len Brown <len.brown@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
a2fd4b4b4e
commit
d2e7d079c7
1 changed files with 13 additions and 10 deletions
|
@ -217,16 +217,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
|
|||
if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) {
|
||||
region_obj->region.flags |= AOPOBJ_SETUP_COMPLETE;
|
||||
|
||||
if (region_obj2->extra.region_context) {
|
||||
|
||||
/* The handler for this region was already installed */
|
||||
|
||||
ACPI_FREE(region_context);
|
||||
} else {
|
||||
/*
|
||||
* Save the returned context for use in all accesses to
|
||||
* this particular region
|
||||
*/
|
||||
/*
|
||||
* Save the returned context for use in all accesses to
|
||||
* the handler for this particular region
|
||||
*/
|
||||
if (!(region_obj2->extra.region_context)) {
|
||||
region_obj2->extra.region_context =
|
||||
region_context;
|
||||
}
|
||||
|
@ -402,6 +397,14 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
|
|||
handler_obj->address_space.
|
||||
context, region_context);
|
||||
|
||||
/*
|
||||
* region_context should have been released by the deactivate
|
||||
* operation. We don't need access to it anymore here.
|
||||
*/
|
||||
if (region_context) {
|
||||
*region_context = NULL;
|
||||
}
|
||||
|
||||
/* Init routine may fail, Just ignore errors */
|
||||
|
||||
if (ACPI_FAILURE(status)) {
|
||||
|
|
Loading…
Reference in a new issue