IntelFrameworkModulePkg: Fix misuses of AllocateCopyPool
authorJian J Wang <jian.j.wang@intel.com>
Wed, 8 Nov 2017 02:09:54 +0000 (10:09 +0800)
committerStar Zeng <star.zeng@intel.com>
Wed, 8 Nov 2017 09:13:04 +0000 (17:13 +0800)
AllocateCopyPool(AllocationSize, *Buffer) will copy "AllocationSize" bytes of
memory from old "Buffer" to new allocated one. If "AllocationSize" is bigger
than size of "Buffer", heap memory overflow occurs during copy.

One solution is to allocate pool first then copy the necessary bytes to new
memory. Another is using ReallocatePool instead if old buffer will be freed
on spot.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Bi Dandan <dandan.bi@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Bi Dandan <dandan.bi@intel.com>
IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c

index 125c49db5edb63f1f01371f16bfe1a5cc31eb6ef..5103c7e5d1d6af60b8b3ad6d8cccecf7c278e10a 100644 (file)
@@ -480,7 +480,11 @@ AddIdToMacDeviceList (
   } else {\r
     mMacDeviceList.MaxListLen += MAX_MAC_ADDRESS_NODE_LIST_LEN;\r
     if (mMacDeviceList.CurListLen != 0) {\r
-      TempDeviceList = (MENU_INFO_ITEM *)AllocateCopyPool (sizeof (MENU_INFO_ITEM) * mMacDeviceList.MaxListLen, (VOID *)mMacDeviceList.NodeList);\r
+      TempDeviceList = ReallocatePool (\r
+                         sizeof (MENU_INFO_ITEM) * mMacDeviceList.CurListLen,\r
+                         sizeof (MENU_INFO_ITEM) * mMacDeviceList.MaxListLen,\r
+                         mMacDeviceList.NodeList\r
+                         );\r
     } else {\r
       TempDeviceList = (MENU_INFO_ITEM *)AllocatePool (sizeof (MENU_INFO_ITEM) * mMacDeviceList.MaxListLen);\r
     }\r
@@ -491,10 +495,6 @@ AddIdToMacDeviceList (
     TempDeviceList[mMacDeviceList.CurListLen].PromptId = PromptId;  \r
     TempDeviceList[mMacDeviceList.CurListLen].QuestionId = (EFI_QUESTION_ID) (mMacDeviceList.CurListLen + NETWORK_DEVICE_LIST_KEY_OFFSET);\r
     \r
-    if (mMacDeviceList.CurListLen > 0) {\r
-      FreePool(mMacDeviceList.NodeList);\r
-    }\r
-    \r
     mMacDeviceList.NodeList = TempDeviceList;\r
   }\r
   mMacDeviceList.CurListLen ++;\r