BaseTools/GenFv: Add/refine boundary checks for strcpy/strcat calls

[mirror_edk2.git] / BaseTools / Source / C / GenFv / GenFvInternalLib.c

diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index 2b80e7919ba250c3ce1d4de6a5f13ad790787855..fc1a7602ab996f9b6fc64a1928998b798999ef30 100644 (file)
--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -824,7 +824,11 @@ Returns:
   //\r
   // Construct Map file Name \r
   //\r
-  strcpy (PeMapFileName, FileName);\r
+  if (strlen (FileName) >= MAX_LONG_FILE_PATH) {\r
+    return EFI_ABORTED;\r
+  }\r
+  strncpy (PeMapFileName, FileName, MAX_LONG_FILE_PATH - 1);\r
+  PeMapFileName[MAX_LONG_FILE_PATH - 1] = 0;\r
   \r
   //\r
   // Change '\\' to '/', unified path format.\r
@@ -861,7 +865,11 @@ Returns:
     Cptr --;\r
   }\r
        *Cptr2 = '\0';\r
-       strcpy (KeyWord, Cptr + 1);\r
+  if (strlen (Cptr + 1) >= MAX_LINE_LEN) {\r
+    return EFI_ABORTED;\r
+  }\r
+  strncpy (KeyWord, Cptr + 1, MAX_LINE_LEN - 1);\r
+  KeyWord[MAX_LINE_LEN - 1] = 0;\r
        *Cptr2 = '.';\r
 \r
   //\r
@@ -3534,7 +3542,12 @@ Returns:
           //\r
           // Construct the original efi file Name \r
           //\r
-          strcpy (PeFileName, FileName);\r
+          if (strlen (FileName) >= MAX_LONG_FILE_PATH) {\r
+            Error (NULL, 0, 2000, "Invalid", "The file name %s is too long.", FileName);\r
+            return EFI_ABORTED;\r
+          }\r
+          strncpy (PeFileName, FileName, MAX_LONG_FILE_PATH - 1);\r
+          PeFileName[MAX_LONG_FILE_PATH - 1] = 0;\r
           Cptr = PeFileName + strlen (PeFileName);\r
           while (*Cptr != '.') {\r
             Cptr --;\r
@@ -3789,7 +3802,12 @@ Returns:
       //\r
       // Construct the original efi file name \r
       //\r
-      strcpy (PeFileName, FileName);\r
+      if (strlen (FileName) >= MAX_LONG_FILE_PATH) {\r
+        Error (NULL, 0, 2000, "Invalid", "The file name %s is too long.", FileName);\r
+        return EFI_ABORTED;\r
+      }\r
+      strncpy (PeFileName, FileName, MAX_LONG_FILE_PATH - 1);\r
+      PeFileName[MAX_LONG_FILE_PATH - 1] = 0;\r
       Cptr = PeFileName + strlen (PeFileName);\r
       while (*Cptr != '.') {\r
         Cptr --;\r