Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c

@@ -86 +86 @@
     } else {
       TempParam = ShellCommandLineGetRawValue (Package, 1);
-      ASSERT (TempParam != NULL);
+      if (TempParam == NULL) {
+        ASSERT (TempParam != NULL);
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"efidecompress");
+        ShellStatus = SHELL_INVALID_PARAMETER;
+        goto Done;
+      }
+
       InFileName  = ShellFindFilePath (TempParam);
       OutFileName = ShellCommandLineGetRawValue (Package, 2);
-      if (InFileName == NULL) {
+      if ((InFileName == NULL) || (OutFileName == NULL)) {
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_FILE_FIND_FAIL), gShellDebug1HiiHandle, L"efidecompress", TempParam);
         ShellStatus = SHELL_NOT_FOUND;
@@ -113 +119 @@
         if (ShellStatus == SHELL_SUCCESS) {
           Status = FileHandleGetSize (InFileHandle, &Temp64Bit);
-          ASSERT_EFI_ERROR (Status);
-          if (!EFI_ERROR (Status)) {
-            ASSERT (Temp64Bit <= (UINT32)(-1));
-            InSize   = (UINTN)Temp64Bit;
-            InBuffer = AllocateZeroPool (InSize);
-          }
-
+          if (EFI_ERROR (Status)) {
+            ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellDebug1HiiHandle, L"efidecompress", ShellCommandLineGetRawValue (Package, 1));
+            ShellStatus = SHELL_NOT_FOUND;
+          }
+        }
+
+        if (ShellStatus == SHELL_SUCCESS) {
+          //
+          // Limit the File Size to UINT32, even though calls accept UINTN.
+          // 32 bits = 4gb.
+          //
+          Status = SafeUint64ToUint32 (Temp64Bit, (UINT32 *)&InSize);
+          if (EFI_ERROR (Status)) {
+            ASSERT_EFI_ERROR (Status);
+            ShellStatus = SHELL_BAD_BUFFER_SIZE;
+            goto Done;
+          }
+
+          InBuffer = AllocateZeroPool (InSize);
           if (InBuffer == NULL) {
             Status = EFI_OUT_OF_RESOURCES;
@@ -167 +185 @@
     }
 
+Done:
+
     ShellCommandLineFreeVarList (Package);
   }