Changeset 99424 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 17, 2023 3:20:42 PM (2 years ago)

Author:

vboxsync

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

156878

Message:

Main/NvramStore: Don't return VINF_SUCCESS for too large files. Get more error info from RTEfiVarStoreOpenAsVfs. bugref:10098

File:

• trunk/src/VBox/Main/src-all/NvramStoreImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-all/NvramStoreImpl.cpp

@@ -745 +745 @@
                         {
                             /* Try to parse it as an EFI variable store. */
+                            RTERRINFOSTATIC ErrInfo;
                             RTVFS hVfsEfiVarStore;
-                            vrc = RTEfiVarStoreOpenAsVfs(hVfsFileNvram, RTVFSMNT_F_READ_ONLY, 0 /*fVarStoreFlags*/, &hVfsEfiVarStore,
-                                                         NULL /*pErrInfo*/);
+                            vrc = RTEfiVarStoreOpenAsVfs(hVfsFileNvram, RTVFSMNT_F_READ_ONLY, 0 /*fVarStoreFlags*/,
+                                                         &hVfsEfiVarStore, RTErrInfoInitStatic(&ErrInfo));
                             if (RT_SUCCESS(vrc))
                             {
@@ -779 +780 @@
                             }
                             else
-                                LogRel(("Opening the UEFI variable store '%s' failed with %Rrc\n", pszPath, vrc));
+                                LogRel(("Opening the UEFI variable store '%s' failed with %Rrc%RTeim\n", pszPath, vrc, &ErrInfo.Core));
 
                             RTVfsFileRelease(hVfsFileNvram);
@@ -799 +800 @@
         }
         else
+        {
             LogRelMax(10, ("NVRAM store '%s' exceeds limit of %u bytes, actual size is %u\n",
                            pszPath, _1M, cbStore));
+            vrc = VERR_OUT_OF_RANGE;
+        }
     }
     else if (vrc == VERR_FILE_NOT_FOUND) /* Valid for the first run where no NVRAM file is there. */