QuarkSocPkg/QncSmmDispatcher: Fix use after free issue

Update Quark North Cluster SMM dispatcher logic to handle
case where an SMI handler unregisters itself.

https://bugzilla.tianocore.org/show_bug.cgi?id=51

This issue was reproduced using the unit test at:

https://github.com/mdkinney/edk2/tree/Bug51/Reproduce

An ASSERT() is generated the 4th time the periodic SMI
handler is triggered when the periodic SMI handler
unregisters itself.  After applying this patch, the
DEBUG() message from the periodic SMI handler in this
unit test is generated 4 times, the periodic SMI handler
is unregistered, and the UEFI Shell works as expected.

Cc: Kelly Steele <kelly.steele@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Kelly Steele <kelly.steele@intel.com>
This commit is contained in:
Michael Kinney 2016-10-04 10:55:24 -07:00
parent 29f169d17a
commit 5f82e02a4b
2 changed files with 38 additions and 5 deletions

View File

@ -387,6 +387,8 @@ struct _DATABASE_RECORD {
UINT32 Signature; UINT32 Signature;
LIST_ENTRY Link; LIST_ENTRY Link;
BOOLEAN Processed;
// //
// Status and Enable bit description // Status and Enable bit description
// //

View File

@ -592,6 +592,7 @@ QNCSmmCoreDispatcher (
BOOLEAN ChildWasDispatched; BOOLEAN ChildWasDispatched;
DATABASE_RECORD *RecordInDb; DATABASE_RECORD *RecordInDb;
DATABASE_RECORD ActiveRecordInDb;
LIST_ENTRY *LinkInDb; LIST_ENTRY *LinkInDb;
DATABASE_RECORD *RecordToExhaust; DATABASE_RECORD *RecordToExhaust;
LIST_ENTRY *LinkToExhaust; LIST_ENTRY *LinkToExhaust;
@ -613,6 +614,16 @@ QNCSmmCoreDispatcher (
Status = EFI_WARN_INTERRUPT_SOURCE_PENDING; Status = EFI_WARN_INTERRUPT_SOURCE_PENDING;
ChildWasDispatched = FALSE; ChildWasDispatched = FALSE;
//
// Mark all child handlers as not processed
//
LinkInDb = GetFirstNode (&mPrivateData.CallbackDataBase);
while (!IsNull (&mPrivateData.CallbackDataBase, LinkInDb)) {
RecordInDb = DATABASE_RECORD_FROM_LINK (LinkInDb);
RecordInDb->Processed = FALSE;
LinkInDb = GetNextNode (&mPrivateData.CallbackDataBase, LinkInDb);
}
// //
// Preserve Index registers // Preserve Index registers
// //
@ -634,6 +645,12 @@ QNCSmmCoreDispatcher (
while ((!IsNull (&mPrivateData.CallbackDataBase, LinkInDb)) && (ResetListSearch == FALSE)) { while ((!IsNull (&mPrivateData.CallbackDataBase, LinkInDb)) && (ResetListSearch == FALSE)) {
RecordInDb = DATABASE_RECORD_FROM_LINK (LinkInDb); RecordInDb = DATABASE_RECORD_FROM_LINK (LinkInDb);
//
// Make a copy of the record that contains an active SMI source,
// because un-register maybe invoked in callback function and
// RecordInDb maybe released
//
CopyMem (&ActiveRecordInDb, RecordInDb, sizeof (ActiveRecordInDb));
// //
// look for the first active source // look for the first active source
@ -663,6 +680,13 @@ QNCSmmCoreDispatcher (
// //
while (!IsNull (&mPrivateData.CallbackDataBase, LinkToExhaust)) { while (!IsNull (&mPrivateData.CallbackDataBase, LinkToExhaust)) {
RecordToExhaust = DATABASE_RECORD_FROM_LINK (LinkToExhaust); RecordToExhaust = DATABASE_RECORD_FROM_LINK (LinkToExhaust);
LinkToExhaust = GetNextNode (&mPrivateData.CallbackDataBase, LinkToExhaust);
if (RecordToExhaust->Processed) {
//
// Record has already been processed. Continue with next child handler.
//
continue;
}
if (CompareSources (&RecordToExhaust->SrcDesc, &ActiveSource)) { if (CompareSources (&RecordToExhaust->SrcDesc, &ActiveSource)) {
// //
@ -692,6 +716,11 @@ QNCSmmCoreDispatcher (
ContextsMatch = TRUE; ContextsMatch = TRUE;
} }
//
// Mark this child handler so it will not be processed again
//
RecordToExhaust->Processed = TRUE;
if (ContextsMatch) { if (ContextsMatch) {
if (RecordToExhaust->BufferSize != 0) { if (RecordToExhaust->BufferSize != 0) {
@ -720,11 +749,13 @@ QNCSmmCoreDispatcher (
SxChildWasDispatched = TRUE; SxChildWasDispatched = TRUE;
} }
} }
//
// Can not use RecordInDb after this point because Callback may have unregistered RecordInDb
// Restart processing of SMI handlers from the begining of the linked list because the
// state of the linked listed may have been modified due to unregister actions in the Callback.
//
LinkToExhaust = GetFirstNode (&mPrivateData.CallbackDataBase);
} }
//
// Get next record in DB
//
LinkToExhaust = GetNextNode (&mPrivateData.CallbackDataBase, &RecordToExhaust->Link);
} }
if (RecordInDb->ClearSource == NULL) { if (RecordInDb->ClearSource == NULL) {
@ -736,7 +767,7 @@ QNCSmmCoreDispatcher (
// //
// This source requires special handling to clear // This source requires special handling to clear
// //
RecordInDb->ClearSource (&ActiveSource); ActiveRecordInDb.ClearSource (&ActiveSource);
} }
if (ChildWasDispatched) { if (ChildWasDispatched) {