1. Fix buffer overflow bugs in SNP, MNP and IP6 driver.

2. Fix GCC build fail issue in DxeNetLib.

Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Ouyang Qian <qian.ouyang@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14017 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 50e40c8eba655123247daede657847cd5a624fef..61e4c8c9d1d9a7004cc56856e74a7bddbfe22388 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -1154,6 +1154,7 @@ NetDestroyLinkList (
 \r
 **/\r
 BOOLEAN\r
+EFIAPI\r
 NetIsInHandleBuffer (\r
   IN  EFI_HANDLE          Handle,\r
   IN  UINTN               NumberOfChildren,\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
index 9e66dc254b4d041adcf94bda21a68168958cd25e..25a7f88482ad38206a7e9fd8a83b6951a66bb3a8 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
@@ -148,7 +148,7 @@ UpdateName (
     for (Index = 0; Index < SnpModeData.HwAddressSize; Index++) {\r
       OffSet += UnicodeSPrint (\r
                   HandleName + OffSet,\r
-                  sizeof (HandleName) - OffSet,\r
+                  sizeof (HandleName) - OffSet * sizeof (CHAR16),\r
                   L"%02X-",\r
                   SnpModeData.CurrentAddress.Addr[Index]\r
                   );\r
@@ -162,7 +162,7 @@ UpdateName (
     //\r
     OffSet += UnicodeSPrint (\r
                 HandleName + OffSet,\r
-                sizeof (HandleName) - OffSet,\r
+                sizeof (HandleName) - OffSet * sizeof (CHAR16),\r
                 L", ProtocolType=0x%X, VlanId=%d)",\r
                 MnpConfigData.ProtocolTypeFilter,\r
                 Instance->MnpServiceData->VlanId\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
index ef499d18cf6578b96d83e58636ca72edad72dfc8..0b12359f14b60c99329579edbcffb3a33bc542a6 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
@@ -266,7 +266,7 @@ UpdateName (
   for (Index = 0; Index < Snp->Mode->HwAddressSize; Index++) {\r
     OffSet += UnicodeSPrint (\r
                 HandleName + OffSet,\r
-                sizeof (HandleName) - OffSet,\r
+                sizeof (HandleName) - OffSet * sizeof (CHAR16),\r
                 L"%02X-",\r
                 Snp->Mode->CurrentAddress.Addr[Index]\r
                 );\r
@@ -276,8 +276,8 @@ UpdateName (
   //\r
   OffSet--;\r
   OffSet += UnicodeSPrint (\r
-              HandleName,\r
-              sizeof (HandleName),\r
+              HandleName + OffSet,\r
+              sizeof (HandleName) - OffSet * sizeof (CHAR16),\r
               L")"\r
               );\r
   if (gSimpleNetworkControllerNameTable != NULL) {\r

diff --git a/NetworkPkg/Ip6Dxe/ComponentName.c b/NetworkPkg/Ip6Dxe/ComponentName.c
index dc164269a82ea03deb942e0606d2a98d0a1912b5..75a1562ca07f31e2e3d1b78bf3c2f31763effde4 100644 (file)
--- a/NetworkPkg/Ip6Dxe/ComponentName.c
+++ b/NetworkPkg/Ip6Dxe/ComponentName.c
@@ -280,7 +280,7 @@ UpdateName (
     }\r
     UnicodeSPrint (\r
       HandleName + Offset,\r
-      sizeof(HandleName) - Offset,\r
+      sizeof(HandleName) - Offset * sizeof (CHAR16),\r
       L"DestinationAddress=%s)",\r
       Address\r
       );\r