add security check.

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

4 files changed, 16 insertions, 5 deletions

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index 9cb7147312..dd2674d224 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 - 2007, Intel Corporation.<BR>

+Copyright (c) 2005 - 2009, Intel Corporation.<BR>

 All rights reserved. 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,7 +582,7 @@ Ip4SetAddress (
 

   Type                      = NetGetIpClass (IpAddr);

   Len                       = NetGetMaskLength (SubnetMask);

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

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

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

 

   //

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
index 9b201c2eae..7b56a6664c 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
@@ -1,7 +1,7 @@
 /** @file

   This file implements the RFC2236: IGMP v2.

   

-Copyright (c) 2005 - 2006, Intel Corporation.<BR>

+Copyright (c) 2005 - 2009, Intel Corporation.<BR>

 All rights reserved. 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

@@ -192,6 +192,9 @@ Ip4SendIgmpMessage (
   NetbufReserve (Packet, IP4_MAX_HEADLEN);

 

   Igmp = (IGMP_HEAD *) NetbufAllocSpace (Packet, sizeof (IGMP_HEAD), FALSE);

+  if (Igmp == NULL) {

+    return EFI_OUT_OF_RESOURCES;

+  }

 

   Igmp->Type        = Type;

   Igmp->MaxRespTime = 0;

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 362e084a7c..84a39656f6 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -1,6 +1,6 @@
 /** @file

 

-Copyright (c) 2005 - 2007, Intel Corporation.<BR>

+Copyright (c) 2005 - 2009, Intel Corporation.<BR>

 All rights reserved. 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

@@ -1314,6 +1314,10 @@ Ip4Groups (
   // host byte order

   //

   if (JoinFlag) {

+    //  

+    // When JoinFlag is TRUE, GroupAddress shouldn't be NULL.

+    //

+    ASSERT (GroupAddress != NULL);

     CopyMem (&Group, GroupAddress, sizeof (IP4_ADDR));

 

     for (Index = 0; Index < IpInstance->GroupCount; Index++) {

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 0f4948d46a..964fb96a79 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -1,7 +1,7 @@
 /** @file

   IP4 input process.

   

-Copyright (c) 2005 - 2007, Intel Corporation.<BR>

+Copyright (c) 2005 - 2009, Intel Corporation.<BR>

 All rights reserved. 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

@@ -265,6 +265,10 @@ Ip4Reassemble (
 

     InsertHeadList (&Table->Bucket[Index], &Assemble->Link);

   }

+  //

+  // Assemble shouldn't be NULL here

+  //

+  ASSERT (Assemble != NULL);

 

   //

   // Find the point to insert the packet: before the first