Clean up PiSmmCore to pass K8 scan

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10098 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Core/PiSmmCore/Locate.c b/MdeModulePkg/Core/PiSmmCore/Locate.c
index 585d3c8253a0546a493ec87099840517adaae3c5..ca95ee4e176f9a7d58390456a00849388266805b 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Locate.c
+++ b/MdeModulePkg/Core/PiSmmCore/Locate.c
@@ -321,14 +321,13 @@ SmmLocateHandle (
     break;\r
 \r
   case ByRegisterNotify:\r
+    GetNext = SmmGetNextLocateByRegisterNotify;\r
     //\r
     // Must have SearchKey for locate ByRegisterNotify\r
     //\r
     if (SearchKey == NULL) {\r
       Status = EFI_INVALID_PARAMETER;\r
-      break;\r
     }\r
-    GetNext = SmmGetNextLocateByRegisterNotify;\r
     break;\r
 \r
   case ByProtocol:\r

diff --git a/MdeModulePkg/Core/PiSmmCore/Pool.c b/MdeModulePkg/Core/PiSmmCore/Pool.c
index 9e86d93e1865ed249a28c73863dd6ade768bf2da..443faab34fefaaceeb74562f48b2def65a85c5f0 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Pool.c
+++ b/MdeModulePkg/Core/PiSmmCore/Pool.c
@@ -101,7 +101,7 @@ InternalAllocPoolByIndex (
   if (PoolIndex == MAX_POOL_INDEX) {\r
     Hdr = (FREE_POOL_HEADER *)AllocatePages (EFI_SIZE_TO_PAGES (MAX_POOL_SIZE << 1));\r
     if (Hdr == NULL) {\r
-      Status = EFI_OUT_OF_RESOURCES;\r
+      return EFI_OUT_OF_RESOURCES;\r
     }\r
   } else if (!IsListEmpty (&mSmmPoolLists[PoolIndex])) {\r
     Hdr = BASE_CR (GetFirstNode (&mSmmPoolLists[PoolIndex]), FREE_POOL_HEADER, Link);\r
@@ -146,6 +146,7 @@ InternalFreePoolByIndex (
 \r
   PoolIndex = HighBitSet32 ((UINT32)FreePoolHdr->Header.Size) - MIN_POOL_SHIFT;\r
   FreePoolHdr->Header.Available = TRUE;\r
+  ASSERT (PoolIndex < MAX_POOL_INDEX);\r
   InsertHeadList (&mSmmPoolLists[PoolIndex], &FreePoolHdr->Link);\r
   return EFI_SUCCESS;\r
 }\r