NetworkPkg:Replace unsafe string functions.

Replace unsafe string functions with new added safe string functions.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

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

4 files changed, 34 insertions, 25 deletions

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.c b/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.c
index 09196c7ac6..270190d42e 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.c
@@ -1,7 +1,7 @@
 /** @file

   Functions implementation related with Mtftp for UefiPxeBc Driver.

 

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

+  Copyright (c) 2007 - 2015, 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

@@ -64,10 +64,11 @@ PxeBcMtftp6CheckPacket (
     //

     Private->Mode.TftpErrorReceived   = TRUE;

     Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;

-    AsciiStrnCpy (

+    AsciiStrnCpyS (

       Private->Mode.TftpError.ErrorString,

+      PXE_MTFTP_ERROR_STRING_LENGTH,

       (CHAR8 *) Packet->Error.ErrorMessage,

-      PXE_MTFTP_ERROR_STRING_LENGTH

+      PXE_MTFTP_ERROR_STRING_LENGTH - 1

       );

     Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';

   }

@@ -151,13 +152,13 @@ PxeBcMtftp6GetFileSize (
   // Build the required options for get info.

   //

   ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_TSIZE_INDEX];

-  PxeBcUintnToAscDec (0, OptBuf);

+  PxeBcUintnToAscDec (0, OptBuf, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);

   ReqOpt[0].ValueStr  = OptBuf;

 

   if (BlockSize != NULL) {

     ReqOpt[1].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];

     ReqOpt[1].ValueStr  = (UINT8 *) (ReqOpt[0].ValueStr + AsciiStrLen ((CHAR8 *) ReqOpt[0].ValueStr) + 1);

-    PxeBcUintnToAscDec (*BlockSize, ReqOpt[1].ValueStr);

+    PxeBcUintnToAscDec (*BlockSize, ReqOpt[1].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX - (AsciiStrLen ((CHAR8 *) ReqOpt[0].ValueStr) + 1));

     OptCnt++;

   }

 

@@ -178,10 +179,11 @@ PxeBcMtftp6GetFileSize (
       //

       Private->Mode.TftpErrorReceived   = TRUE;

       Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;

-      AsciiStrnCpy (

+      AsciiStrnCpyS (

         Private->Mode.TftpError.ErrorString,

+        PXE_MTFTP_ERROR_STRING_LENGTH,

         (CHAR8 *) Packet->Error.ErrorMessage,

-        PXE_MTFTP_ERROR_STRING_LENGTH

+        PXE_MTFTP_ERROR_STRING_LENGTH - 1

         );

       Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';

     }

@@ -273,7 +275,7 @@ PxeBcMtftp6ReadFile (
   if (BlockSize != NULL) {

     ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];

     ReqOpt[0].ValueStr  = OptBuf;

-    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr);

+    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);

     OptCnt++;

   }

 

@@ -356,7 +358,7 @@ PxeBcMtftp6WriteFile (
   if (BlockSize != NULL) {

     ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];

     ReqOpt[0].ValueStr  = OptBuf;

-    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr);

+    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);

     OptCnt++;

   }

 

@@ -431,7 +433,7 @@ PxeBcMtftp6ReadDirectory (
   if (BlockSize != NULL) {

     ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];

     ReqOpt[0].ValueStr  = OptBuf;

-    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr);

+    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);

     OptCnt++;

   }

 

@@ -508,10 +510,11 @@ PxeBcMtftp4CheckPacket (
     //

     Private->Mode.TftpErrorReceived   = TRUE;

     Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;

-    AsciiStrnCpy (

+    AsciiStrnCpyS (

       Private->Mode.TftpError.ErrorString,

+      PXE_MTFTP_ERROR_STRING_LENGTH,

       (CHAR8 *) Packet->Error.ErrorMessage,

-      PXE_MTFTP_ERROR_STRING_LENGTH

+      PXE_MTFTP_ERROR_STRING_LENGTH - 1

       );

     Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';

   }

@@ -595,13 +598,13 @@ PxeBcMtftp4GetFileSize (
   // Build the required options for get info.

   //

   ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_TSIZE_INDEX];

-  PxeBcUintnToAscDec (0, OptBuf);

+  PxeBcUintnToAscDec (0, OptBuf, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);

   ReqOpt[0].ValueStr  = OptBuf;

 

   if (BlockSize != NULL) {

     ReqOpt[1].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];

     ReqOpt[1].ValueStr  = (UINT8 *) (ReqOpt[0].ValueStr + AsciiStrLen ((CHAR8 *) ReqOpt[0].ValueStr) + 1);

-    PxeBcUintnToAscDec (*BlockSize, ReqOpt[1].ValueStr);

+    PxeBcUintnToAscDec (*BlockSize, ReqOpt[1].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX - (AsciiStrLen ((CHAR8 *) ReqOpt[0].ValueStr) + 1));

     OptCnt++;

   }

 

@@ -622,10 +625,11 @@ PxeBcMtftp4GetFileSize (
       //

       Private->Mode.TftpErrorReceived   = TRUE;

       Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;

-      AsciiStrnCpy (

+      AsciiStrnCpyS (

         Private->Mode.TftpError.ErrorString,

+        PXE_MTFTP_ERROR_STRING_LENGTH,

         (CHAR8 *) Packet->Error.ErrorMessage,

-        PXE_MTFTP_ERROR_STRING_LENGTH

+        PXE_MTFTP_ERROR_STRING_LENGTH - 1

         );

       Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';

     }

@@ -717,7 +721,7 @@ PxeBcMtftp4ReadFile (
   if (BlockSize != NULL) {

     ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];

     ReqOpt[0].ValueStr  = OptBuf;

-    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr);

+    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);

     OptCnt++;

   }

 

@@ -800,7 +804,7 @@ PxeBcMtftp4WriteFile (
   if (BlockSize != NULL) {

     ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];

     ReqOpt[0].ValueStr  = OptBuf;

-    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr);

+    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);

     OptCnt++;

   }

 

@@ -875,7 +879,7 @@ PxeBcMtftp4ReadDirectory (
   if (BlockSize != NULL) {

     ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];

     ReqOpt[0].ValueStr  = OptBuf;

-    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr);

+    PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);

     OptCnt++;

   }

 

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.h b/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.h
index 1064195a82..f1150762c6 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.h
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.h
@@ -1,7 +1,7 @@
 /** @file

   Functions declaration related with Mtftp for UefiPxeBc Driver.

 

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

+  Copyright (c) 2007 - 2015, 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

@@ -21,6 +21,7 @@
 #define PXE_MTFTP_OPTION_TSIZE_INDEX       2

 #define PXE_MTFTP_OPTION_MULTICAST_INDEX   3

 #define PXE_MTFTP_OPTION_MAXIMUM_INDEX     4

+#define PXE_MTFTP_OPTBUF_MAXNUM_INDEX      128

 

 #define PXE_MTFTP_ERROR_STRING_LENGTH      127   // refer to definition of struct EFI_PXE_BASE_CODE_TFTP_ERROR.

 #define PXE_MTFTP_DEFAULT_BLOCK_SIZE       512   // refer to rfc-1350.

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
index 88ae7b6a7a..36b0665a96 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
@@ -1,7 +1,7 @@
 /** @file

   Support functions implementation for UefiPxeBc Driver.

 

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

+  Copyright (c) 2007 - 2015, 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

@@ -1392,6 +1392,7 @@ PxeBcUintnToAscDecWithFormat (
 

   @param[in]  Number         Numeric value to be converted.

   @param[in]  Buffer         The pointer to the buffer for ASCII string.

+  @param[in]  BufferSize     The maxsize of the buffer.

 

   @return     Length         The actual length of the ASCII string.

 

@@ -1399,7 +1400,8 @@ PxeBcUintnToAscDecWithFormat (
 UINTN

 PxeBcUintnToAscDec (

   IN UINTN               Number,

-  IN UINT8               *Buffer

+  IN UINT8               *Buffer,

+  IN UINTN               BufferSize

   )

 {

   UINTN           Index;

@@ -1415,7 +1417,7 @@ PxeBcUintnToAscDec (
     Number         = (UINTN) (Number / 10);

   } while (Number != 0);

 

-  AsciiStrCpy ((CHAR8 *) Buffer, &TempStr[Index]);

+  AsciiStrCpyS ((CHAR8 *) Buffer, BufferSize, &TempStr[Index]);

 

   Length = AsciiStrLen ((CHAR8 *) Buffer);

 

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.h b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.h
index fc99fadad6..0a43aeb79b 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.h
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.h
@@ -448,14 +448,16 @@ PxeBcUintnToAscDecWithFormat (
 

   @param[in]  Number         Numeric value to be converted.

   @param[in]  Buffer         Pointer to the buffer for ASCII string.

-

+  @param[in]  BufferSize     The maxsize of the buffer.

+  

   @return     Length         The actual length of the ASCII string.

 

 **/

 UINTN

 PxeBcUintnToAscDec (

   IN UINTN               Number,

-  IN UINT8               *Buffer

+  IN UINT8               *Buffer,

+  IN UINTN               BufferSize

   );

 

 /**