Refine code to make it more safely.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15598 6f19259b-4bc3-4df7-8a09-765794883524

8 files changed, 15 insertions, 7 deletions

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
index 19ad101d54..995bbcf840 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
@@ -1,7 +1,7 @@
 /** @file

   EFI DHCP protocol implementation.

   

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -404,6 +404,7 @@ DhcpLeaseAcquired (
 

   if (DhcpSb->Netmask == 0) {

     Class           = NetGetIpClass (DhcpSb->ClientAddr);

+    ASSERT (Class < IP4_ADDR_CLASSE);

     DhcpSb->Netmask = gIp4AllMasks[Class << 3];

   }

 

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index a9c6df9db9..f8ae161b4c 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -227,6 +227,7 @@ IScsiUpdateDeviceList (
                   );

   if (Status == EFI_BUFFER_TOO_SMALL) {

     DeviceList = (ISCSI_DEVICE_LIST *) AllocatePool (DataSize);

+    ASSERT (DeviceList != NULL);

 

     gRT->GetVariable (

           L"iSCSIDeviceList",

@@ -291,6 +292,7 @@ IScsiUpdateDeviceList (
   //

   DeviceListSize        = sizeof (ISCSI_DEVICE_LIST) + (NumHandles - 1) * sizeof (ISCSI_MAC_INFO);

   DeviceList            = (ISCSI_DEVICE_LIST *) AllocatePool (DeviceListSize);

+  ASSERT (DeviceList != NULL);

   DeviceList->NumDevice = (UINT8) NumHandles;

 

   for (Index = 0; Index < NumHandles; Index++) {

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index a00d805b84..1cb1fb89d9 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -219,6 +219,7 @@ IScsiLunToUnicodeStr (
     TempStr += StrLen (TempStr);

   }

 

+  ASSERT (StrLen(Str) >= 1);

   Str[StrLen (Str) - 1] = 0;

 

   for (Index = StrLen (Str) - 1; Index > 1; Index = Index - 2) {

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index e4ab17a37e..3c29f75f88 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -1,7 +1,7 @@
 /** @file

   Implement IP4 pesudo interface.

   

-Copyright (c) 2005 - 2013, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -582,6 +582,7 @@ Ip4SetAddress (
 

   Type                      = NetGetIpClass (IpAddr);

   Len                       = NetGetMaskLength (SubnetMask);

+  ASSERT (Len >= 1);

   Netmask                   = gIp4AllMasks[MIN ((Len - 1), Type << 3)];

   Interface->NetBrdcast     = (IpAddr | ~Netmask);

 

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
index ae157c5e0a..21547ee3af 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
@@ -1,7 +1,7 @@
 /** @file

   Routines to process Rrq (download).

   

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -704,6 +704,7 @@ Mtftp4RrqInput (
 

   } else {

     Packet = (EFI_MTFTP4_PACKET *) NetbufGetByte (UdpPacket, 0, NULL);

+    ASSERT (Packet != NULL);

   }

 

   Opcode = NTOHS (Packet->OpCode);

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index 412c472e42..e825714700 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
@@ -1,7 +1,7 @@
 /** @file

   Routines to process Wrq (upload).

   

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -398,6 +398,7 @@ Mtftp4WrqInput (
 

   } else {

     Packet = (EFI_MTFTP4_PACKET *) NetbufGetByte (UdpPacket, 0, NULL);

+    ASSERT (Packet != NULL);

   }

 

   Opcode = NTOHS (Packet->OpCode);

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
index ed583b4888..ff93167767 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
@@ -1,7 +1,7 @@
 /** @file

   Implementation of driver entry point and driver binding protocol.

 

-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials are licensed

 and made available under the terms and conditions of the BSD License which

 accompanies this distribution. The full text of the license may be found at

@@ -545,8 +545,8 @@ SimpleNetworkDriverStart (
   // the IO BAR.  Save the index of the BAR into the adapter info structure.

   // for  regular 32bit BARs, 0 is memory mapped, 1 is io mapped

   //

-  ConfigHeader  = (PCI_TYPE00 *) &ConfigInfo.Config.Byte[0];

-  TempBar       = (UINT32 *) &ConfigHeader->Device.Bar[0];

+  ConfigHeader  = (PCI_TYPE00 *) ConfigInfo.Config.Byte;

+  TempBar       = (UINT32 *) ConfigHeader->Device.Bar;

   for (BarIndex = 0; BarIndex <= 5; BarIndex++) {

     if ((*TempBar & PCI_BAR_MEM_MASK) == PCI_BAR_MEM_64BIT) {

       //

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
index e016cc0f51..1293f67268 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
@@ -477,6 +477,7 @@ PxeBcCheckSelectedOffer (
         //

         Status = EFI_NO_RESPONSE;

 

+        ASSERT (Private->NumOffers < PXEBC_MAX_OFFER_NUM);

         for (Index = 0; Index < Private->NumOffers; Index++) {

 

           Offer = &Private->Dhcp4Offers[Index].Packet.Offer;