diff options
author | jkim <jkim@FreeBSD.org> | 2012-06-27 16:07:58 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2012-06-27 16:07:58 +0000 |
commit | bed871bb76b9fc47b3a3595700ef242f22f33ea4 (patch) | |
tree | dc82af2494ae0a10768425c714f62ecab93b1bb9 | |
parent | f23a349d9fb9c359359e5f64b63ea4e15d776c76 (diff) | |
download | FreeBSD-src-bed871bb76b9fc47b3a3595700ef242f22f33ea4.zip FreeBSD-src-bed871bb76b9fc47b3a3595700ef242f22f33ea4.tar.gz |
Do not malloc(9) while holding a spin lock, to avoid panic. Note it was
submitted upstream and it should be fixed in the next ACPICA release.
Discussed with: Moore, Robert (robert dot moore at intel dot com)
-rw-r--r-- | source/components/events/evxfgpe.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/source/components/events/evxfgpe.c b/source/components/events/evxfgpe.c index daea888..750c460 100644 --- a/source/components/events/evxfgpe.c +++ b/source/components/events/evxfgpe.c @@ -298,7 +298,7 @@ AcpiSetupGpeForWake ( ACPI_STATUS Status; ACPI_GPE_EVENT_INFO *GpeEventInfo; ACPI_NAMESPACE_NODE *DeviceNode; - ACPI_GPE_NOTIFY_INFO *Notify; + ACPI_GPE_NOTIFY_INFO *NewNotify, *Notify; ACPI_CPU_FLAGS Flags; @@ -334,6 +334,12 @@ AcpiSetupGpeForWake ( return_ACPI_STATUS (AE_BAD_PARAMETER); } + NewNotify = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_GPE_NOTIFY_INFO)); + if (!NewNotify) + { + return_ACPI_STATUS (AE_NO_MEMORY); + } + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); /* Ensure that we have a valid GPE number */ @@ -384,16 +390,10 @@ AcpiSetupGpeForWake ( /* Add this device to the notify list for this GPE */ - Notify = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_GPE_NOTIFY_INFO)); - if (!Notify) - { - Status = AE_NO_MEMORY; - goto UnlockAndExit; - } - - Notify->DeviceNode = DeviceNode; - Notify->Next = GpeEventInfo->Dispatch.NotifyList; - GpeEventInfo->Dispatch.NotifyList = Notify; + NewNotify->DeviceNode = DeviceNode; + NewNotify->Next = GpeEventInfo->Dispatch.NotifyList; + GpeEventInfo->Dispatch.NotifyList = NewNotify; + NewNotify = NULL; } /* Mark the GPE as a possible wake event */ @@ -403,6 +403,10 @@ AcpiSetupGpeForWake ( UnlockAndExit: AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); + if (NewNotify) + { + ACPI_FREE (NewNotify); + } return_ACPI_STATUS (Status); } |