Changeset 90335 in vbox for trunk/src/VBox/Runtime/tools

Timestamp:

Jul 26, 2021 1:24:20 PM (4 years ago)

Author:

vboxsync

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

145898

Message:

Runtime/tools/RTEfiSigDb: Try to fix lin32 builds, bugref:9580

File:

• trunk/src/VBox/Runtime/tools/RTEfiSigDb.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/tools/RTEfiSigDb.cpp

@@ -45 +45 @@
 
 #include <iprt/formats/efi-signature.h>
+#include <iprt/formats/efi-varstore.h>
 
 
@@ -56 +57 @@
 *********************************************************************************************************************************/
 /** Signature type identifier to internal type mapping. */
-struct
+struct RTEFISIGDBID2TYPEENTRY
 {
     const char   *pszId;
@@ -398 +399 @@
 
 /**
+ * Sets the given attributes for the given EFI variable store variable.
+ *
+ * @returns IPRT status code.
+ * @param   hVfsVarStore        Handle of the EFI variable store VFS.
+ * @param   pszVar              The variable to set the attributes for.
+ * @param   fAttr               The attributes to set, see EFI_VAR_HEADER_ATTR_XXX.
+ */
+static int rtEfiSigDbSetVarAttr(RTVFS hVfsVarStore, const char *pszVar, uint32_t fAttr)
+{
+    char szVarPath[_1K];
+    ssize_t cch = RTStrPrintf2(szVarPath, sizeof(szVarPath), "/raw/%s/attr", pszVar);
+    Assert(cch > 0);
+
+    RTVFSFILE hVfsFileAttr = NIL_RTVFSFILE;
+    int rc = RTVfsFileOpen(hVfsVarStore, szVarPath,
+                           RTFILE_O_READWRITE | RTFILE_O_DENY_NONE | RTFILE_O_OPEN,
+                           &hVfsFileAttr);
+    if (RT_SUCCESS(rc))
+    {
+        uint32_t fAttrLe = RT_H2LE_U32(fAttr);
+        rc = RTVfsFileWrite(hVfsFileAttr, &fAttrLe, sizeof(fAttrLe), NULL /*pcbWritten*/);
+        RTVfsFileRelease(hVfsFileAttr);
+    }
+
+    return rc;
+}
+
+
+/**
  * Adds the given signature to the given signature database of the given EFI variable store.
  *
@@ -423 +453 @@
                            RTFILE_O_READWRITE | RTFILE_O_DENY_NONE | RTFILE_O_OPEN,
                            &hVfsFileSigDb);
-    if (rc == VERR_PATH_NOT_FOUND)
+    if (   rc == VERR_PATH_NOT_FOUND
+        || rc == VERR_FILE_NOT_FOUND)
     {
         /*
@@ -441 +472 @@
             if (RT_SUCCESS(rc))
                 RTVfsDirRelease(hVfsDirGuid);
+            else if (rc == VERR_ALREADY_EXISTS)
+                rc = VINF_SUCCESS;
 
             RTVfsDirRelease(hVfsDirRoot);
@@ -448 +481 @@
 
         if (RT_SUCCESS(rc))
+        {
             rc = RTVfsFileOpen(hVfsVarStore, szDbPath,
                                RTFILE_O_READWRITE | RTFILE_O_DENY_NONE | RTFILE_O_CREATE,
                                &hVfsFileSigDb);
+            if (RT_SUCCESS(rc))
+                rc = rtEfiSigDbSetVarAttr(hVfsVarStore, pszDb,
+                                            EFI_VAR_HEADER_ATTR_NON_VOLATILE
+                                          | EFI_VAR_HEADER_ATTR_BOOTSERVICE_ACCESS
+                                          | EFI_VAR_HEADER_ATTR_RUNTIME_ACCESS
+                                          | EFI_AUTH_VAR_HEADER_ATTR_TIME_BASED_AUTH_WRITE_ACCESS);
+        }
 
         if (RT_FAILURE(rc))