BaseTools/GenBootSector: Add/refine boundary checks for strcpy/strcat

[mirror_edk2.git] / BaseTools / Source / C / GenBootSector / GenBootSector.c

diff --git a/BaseTools/Source/C/GenBootSector/GenBootSector.c b/BaseTools/Source/C/GenBootSector/GenBootSector.c
index 40cb19fb59e17bbb4b1966d06fdc062a14fa5a1b..c02de49ba2ad6e3e67e59f68853e8655cf572e68 100644 (file)
--- a/BaseTools/Source/C/GenBootSector/GenBootSector.c
+++ b/BaseTools/Source/C/GenBootSector/GenBootSector.c
@@ -4,7 +4,7 @@ Reading/writing MBR/DBR.
     If we write MBR to disk, we just update the MBR code and the partition table wouldn't be over written.\r
     If we process DBR, we will patch MBR to set first partition active if no active partition exists.\r
     \r
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -167,7 +167,7 @@ Return:
   if (VolumeHandle == INVALID_HANDLE_VALUE) {\r
     fprintf (\r
       stderr, \r
-      "error E0005: CreateFile failed: Volume = %s, LastError = 0x%x\n", \r
+      "error E0005: CreateFile failed: Volume = %s, LastError = 0x%lx\n", \r
       VolumeAccessPath, \r
       GetLastError ()\r
       );\r
@@ -201,6 +201,7 @@ Return:
     //\r
     // Only care about the disk.\r
     //\r
+    CloseHandle(VolumeHandle);\r
     return FALSE;\r
   } else{\r
     DriveInfo->DiskNumber = StorageDeviceNumber.DeviceNumber;\r
@@ -278,7 +279,7 @@ GetBootSectorOffset (
 Description:\r
   Get the offset of boot sector.\r
   For non-MBR disk, offset is just 0\r
-  for disk with MBR, offset needs to be caculated by parsing MBR\r
+  for disk with MBR, offset needs to be calculated by parsing MBR\r
 \r
   NOTE: if no one is active, we will patch MBR to select first partition as active.\r
 \r
@@ -437,8 +438,8 @@ ProcessBsOrMbr (
   BYTE              DiskPartitionBackup[0x200] = {0};\r
   DWORD             BytesReturn;\r
   INT               DrvNumOffset;\r
-  HANDLE            InputHandle;\r
-  HANDLE            OutputHandle;\r
+  HANDLE            InputHandle = INVALID_HANDLE_VALUE;\r
+  HANDLE            OutputHandle = INVALID_HANDLE_VALUE;\r
   ERROR_STATUS      Status;\r
   DWORD             InputDbrOffset;\r
   DWORD             OutputDbrOffset;\r
@@ -448,7 +449,7 @@ ProcessBsOrMbr (
   //\r
   Status =  GetFileHandle(InputInfo, ProcessMbr, &InputHandle, &InputDbrOffset);\r
   if (Status != ErrorSuccess) {\r
-    return Status;\r
+    goto Done;\r
   }\r
 \r
   //\r
@@ -456,14 +457,15 @@ ProcessBsOrMbr (
   //\r
   Status = GetFileHandle(OutputInfo, ProcessMbr, &OutputHandle, &OutputDbrOffset);\r
   if (Status != ErrorSuccess) {\r
-    return Status;\r
+    goto Done;\r
   }\r
 \r
   //\r
   // Read boot sector from source disk/file\r
   // \r
   if (!ReadFile (InputHandle, DiskPartition, 0x200, &BytesReturn, NULL)) {\r
-    return ErrorFileReadWrite;\r
+    Status = ErrorFileReadWrite;\r
+    goto Done;\r
   }\r
 \r
   if (InputInfo->Type == PathUsb) {\r
@@ -473,7 +475,8 @@ ProcessBsOrMbr (
       //\r
       DrvNumOffset = GetDrvNumOffset (DiskPartition);\r
       if (DrvNumOffset == -1) {\r
-        return ErrorFatType;\r
+        Status = ErrorFatType;\r
+        goto Done;\r
       }\r
       //\r
       // Some legacy BIOS require 0x80 discarding MBR.\r
@@ -495,7 +498,8 @@ ProcessBsOrMbr (
       // Use original partition table\r
       //\r
       if (!ReadFile (OutputHandle, DiskPartitionBackup, 0x200, &BytesReturn, NULL)) {\r
-        return ErrorFileReadWrite;\r
+        Status = ErrorFileReadWrite;\r
+        goto Done;\r
       }\r
       memcpy (DiskPartition + 0x1BE, DiskPartitionBackup + 0x1BE, 0x40);\r
       SetFilePointer (OutputHandle, 0, NULL, FILE_BEGIN);\r
@@ -507,13 +511,19 @@ ProcessBsOrMbr (
   // Write boot sector to taget disk/file\r
   // \r
   if (!WriteFile (OutputHandle, DiskPartition, 0x200, &BytesReturn, NULL)) {\r
-    return ErrorFileReadWrite;\r
+    Status = ErrorFileReadWrite;\r
+    goto Done;\r
   }\r
 \r
-  CloseHandle (InputHandle);\r
-  CloseHandle (OutputHandle);\r
+Done:\r
+  if (InputHandle != INVALID_HANDLE_VALUE) {\r
+    CloseHandle (InputHandle);\r
+  }\r
+  if (OutputHandle != INVALID_HANDLE_VALUE) {\r
+    CloseHandle (OutputHandle);\r
+  }\r
 \r
-  return ErrorSuccess;\r
+  return Status;\r
 }\r
 \r
 void\r
@@ -599,7 +609,7 @@ GetPathInfo (
     }\r
 \r
     if (!GetDriveInfo(VolumeLetter, &DriveInfo)) {\r
-      fprintf (stderr, "ERROR: GetDriveInfo - 0x%x\n", GetLastError ());\r
+      fprintf (stderr, "ERROR: GetDriveInfo - 0x%lx\n", GetLastError ());\r
       return ErrorPath;\r
     }\r
 \r
@@ -621,6 +631,14 @@ GetPathInfo (
        return ErrorSuccess;\r
   } \r
 \r
+  //\r
+  // Check the path length\r
+  //\r
+  if (strlen (PathInfo->Path) >= (sizeof (PathInfo->PhysicalPath) / sizeof (PathInfo->PhysicalPath[0]))) {\r
+    fprintf (stderr, "ERROR, Path is too long for - %s", PathInfo->Path);\r
+    return ErrorPath;\r
+  }\r
+\r
   PathInfo->Type = PathFile;\r
   if (PathInfo->Input) {\r
     //\r
@@ -630,10 +648,16 @@ GetPathInfo (
     if (f == NULL) {\r
       fprintf (stderr, "error E2003: File was not provided!\n");\r
       return ErrorPath;\r
-    }  \r
+    }\r
+    fclose (f);\r
   }\r
   PathInfo->Type = PathFile;\r
-  strcpy(PathInfo->PhysicalPath, PathInfo->Path);\r
+  strncpy(\r
+    PathInfo->PhysicalPath,\r
+    PathInfo->Path,\r
+    sizeof (PathInfo->PhysicalPath) / sizeof (PathInfo->PhysicalPath[0]) - 1\r
+    );\r
+  PathInfo->PhysicalPath[sizeof (PathInfo->PhysicalPath) / sizeof (PathInfo->PhysicalPath[0]) - 1] = 0;\r
 \r
   return ErrorSuccess;\r
 }    \r
@@ -787,7 +811,7 @@ main (
   } else {\r
     fprintf (\r
       stderr, \r
-      "%s: %s %s: failed - %s (LastError: 0x%x)!\n",\r
+      "%s: %s %s: failed - %s (LastError: 0x%lx)!\n",\r
       (Status == ErrorNoMbr) ? "WARNING" : "ERROR",\r
       (OutputPathInfo.Type != PathFile) ? "Write" : "Read", \r
       ProcessMbr ? "MBR" : "DBR", \r