Revision: 14017
http://edk2.svn.sourceforge.net/edk2/?rev=14017&view=rev
Author: sfu5
Date: 2012-12-24 02:52:27 +0000 (Mon, 24 Dec 2012)
Log Message:
-----------
1. Fix buffer overflow bugs in SNP, MNP and IP6 driver.
2. Fix GCC build fail issue in DxeNetLib.
Signed-off-by: Fu Siyuan <[email protected]>
Reviewed-by: Ye Ting <[email protected]>
Reviewed-by: Ouyang Qian <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
trunk/edk2/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
trunk/edk2/NetworkPkg/Ip6Dxe/ComponentName.c
Modified: trunk/edk2/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
===================================================================
--- trunk/edk2/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c 2012-12-22
00:47:17 UTC (rev 14016)
+++ trunk/edk2/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c 2012-12-24
02:52:27 UTC (rev 14017)
@@ -1154,6 +1154,7 @@
**/
BOOLEAN
+EFIAPI
NetIsInHandleBuffer (
IN EFI_HANDLE Handle,
IN UINTN NumberOfChildren,
Modified: trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
2012-12-22 00:47:17 UTC (rev 14016)
+++ trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
2012-12-24 02:52:27 UTC (rev 14017)
@@ -148,7 +148,7 @@
for (Index = 0; Index < SnpModeData.HwAddressSize; Index++) {
OffSet += UnicodeSPrint (
HandleName + OffSet,
- sizeof (HandleName) - OffSet,
+ sizeof (HandleName) - OffSet * sizeof (CHAR16),
L"%02X-",
SnpModeData.CurrentAddress.Addr[Index]
);
@@ -162,7 +162,7 @@
//
OffSet += UnicodeSPrint (
HandleName + OffSet,
- sizeof (HandleName) - OffSet,
+ sizeof (HandleName) - OffSet * sizeof (CHAR16),
L", ProtocolType=0x%X, VlanId=%d)",
MnpConfigData.ProtocolTypeFilter,
Instance->MnpServiceData->VlanId
Modified: trunk/edk2/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
2012-12-22 00:47:17 UTC (rev 14016)
+++ trunk/edk2/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
2012-12-24 02:52:27 UTC (rev 14017)
@@ -266,7 +266,7 @@
for (Index = 0; Index < Snp->Mode->HwAddressSize; Index++) {
OffSet += UnicodeSPrint (
HandleName + OffSet,
- sizeof (HandleName) - OffSet,
+ sizeof (HandleName) - OffSet * sizeof (CHAR16),
L"%02X-",
Snp->Mode->CurrentAddress.Addr[Index]
);
@@ -276,8 +276,8 @@
//
OffSet--;
OffSet += UnicodeSPrint (
- HandleName,
- sizeof (HandleName),
+ HandleName + OffSet,
+ sizeof (HandleName) - OffSet * sizeof (CHAR16),
L")"
);
if (gSimpleNetworkControllerNameTable != NULL) {
Modified: trunk/edk2/NetworkPkg/Ip6Dxe/ComponentName.c
===================================================================
--- trunk/edk2/NetworkPkg/Ip6Dxe/ComponentName.c 2012-12-22 00:47:17 UTC
(rev 14016)
+++ trunk/edk2/NetworkPkg/Ip6Dxe/ComponentName.c 2012-12-24 02:52:27 UTC
(rev 14017)
@@ -280,7 +280,7 @@
}
UnicodeSPrint (
HandleName + Offset,
- sizeof(HandleName) - Offset,
+ sizeof(HandleName) - Offset * sizeof (CHAR16),
L"DestinationAddress=%s)",
Address
);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
