add security check.

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

3 files changed, 9 insertions, 5 deletions

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
index 3f64bf0..f5b6bbc 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 - 2007, Intel Corporation<BR>

+Copyright (c) 2006 - 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

@@ -99,7 +99,6 @@ Mtftp4RrqSendAck (
   NET_BUF                   *Packet;

 

   Packet = NetbufAlloc (sizeof (EFI_MTFTP4_ACK_HEADER));

-

   if (Packet == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

@@ -109,6 +108,7 @@ Mtftp4RrqSendAck (
                                 sizeof (EFI_MTFTP4_ACK_HEADER),

                                 FALSE

                                 );

+  ASSERT (Ack != NULL);

 

   Ack->Ack.OpCode   = HTONS (EFI_MTFTP4_OPCODE_ACK);

   Ack->Ack.Block[0] = HTONS (BlkNo);

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
index be3c8c9..5c8516f 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
@@ -1,7 +1,7 @@
 /** @file

   Support routines for Mtftp.

   

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

+Copyright (c) 2006 - 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

@@ -291,6 +291,8 @@ Mtftp4SendRequest (
   }

 

   Packet         = (EFI_MTFTP4_PACKET *) NetbufAllocSpace (Nbuf, Len, FALSE);

+  ASSERT (Packet != NULL);

+

   Packet->OpCode = HTONS (Instance->Operation);

   Cur            = Packet->Rrq.Filename;

   Cur            = (UINT8 *) AsciiStrCpy ((CHAR8 *) Cur, (CHAR8 *) Token->Filename);

@@ -335,12 +337,13 @@ Mtftp4SendError (
 

   Len     = (UINT32) (AsciiStrLen ((CHAR8 *) ErrInfo) + sizeof (EFI_MTFTP4_ERROR_HEADER));

   Packet  = NetbufAlloc (Len);

-

   if (Packet == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

 

   TftpError         = (EFI_MTFTP4_PACKET *) NetbufAllocSpace (Packet, Len, FALSE);

+  ASSERT (TftpError != NULL);

+

   TftpError->OpCode = HTONS (EFI_MTFTP4_OPCODE_ERROR);

   TftpError->Error.ErrorCode = HTONS (ErrCode);

 

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index cb39da4..872b295 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, Intel Corporation<BR>

+Copyright (c) 2006 - 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

@@ -52,6 +52,7 @@ Mtftp4WrqSendBlock (
   }

 

   Packet = (EFI_MTFTP4_PACKET *) NetbufAllocSpace (UdpPacket, MTFTP4_DATA_HEAD_LEN, FALSE);

+  ASSERT (Packet != NULL);

 

   Packet->Data.OpCode = HTONS (EFI_MTFTP4_OPCODE_DATA);

   Packet->Data.Block  = HTONS (BlockNum);