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

Timestamp:

Mar 14, 2023 3:47:35 PM (2 years ago)

Author:

vboxsync

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

156314

Message:

Main/UefiVairableStore: The shim parsing the MokList rejects it due to EFI_VAR_HEADER_ATTR_RUNTIME_ACCESS being set, bugref:10287

Location:

trunk/src/VBox/Main

Files:

• include/UefiVariableStoreImpl.h (modified) (1 diff)
• src-server/UefiVariableStoreImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/UefiVariableStoreImpl.h

@@ -94 +94 @@
     HRESULT i_uefiSigDbAddSig(RTEFISIGDB hEfiSigDb, const void *pvData, size_t cbData, const com::Guid &aOwnerUuid, SignatureType_T enmSignatureType);
     HRESULT i_uefiVarStoreAddSignatureToDbVec(PCEFI_GUID pGuid, const char *pszDb, const std::vector<BYTE> &aData,
-                                              const com::Guid &aOwnerUuid, SignatureType_T enmSignatureType);
+                                              const com::Guid &aOwnerUuid, SignatureType_T enmSignatureType, bool fRuntime = true);
     HRESULT i_uefiVarStoreAddSignatureToDb(PCEFI_GUID pGuid, const char *pszDb, const void *pvData, size_t cbData,
-                                           const com::Guid &aOwnerUuid, SignatureType_T enmSignatureType);
+                                           const com::Guid &aOwnerUuid, SignatureType_T enmSignatureType, bool fRuntime = true);
 
     struct Data;            // opaque data struct, defined in UefiVariableStoreImpl.cpp

trunk/src/VBox/Main/src-server/UefiVariableStoreImpl.cpp

@@ -568 +568 @@
 
     EFI_GUID GuidMokList = EFI_IMAGE_MOK_DATABASE_GUID;
-    hrc = i_uefiVarStoreAddSignatureToDbVec(&GuidMokList, "MokList", aData, aOwnerUuid, enmSignatureType);
+    hrc = i_uefiVarStoreAddSignatureToDbVec(&GuidMokList, "MokList", aData, aOwnerUuid, enmSignatureType, false /*fRuntime*/);
 
     i_releaseUefiVariableStore();
@@ -927 +927 @@
 
 HRESULT UefiVariableStore::i_uefiVarStoreAddSignatureToDb(PCEFI_GUID pGuid, const char *pszDb, const void *pvData, size_t cbData,
-                                                          const com::Guid &aOwnerUuid, SignatureType_T enmSignatureType)
+                                                          const com::Guid &aOwnerUuid, SignatureType_T enmSignatureType, bool fRuntime)
 {
     RTVFSFILE hVfsFileSigDb = NIL_RTVFSFILE;
@@ -934 +934 @@
                                          EFI_VAR_HEADER_ATTR_NON_VOLATILE
                                        | EFI_VAR_HEADER_ATTR_BOOTSERVICE_ACCESS
-                                       | EFI_VAR_HEADER_ATTR_RUNTIME_ACCESS
+                                       | (fRuntime ? EFI_VAR_HEADER_ATTR_RUNTIME_ACCESS : 0)
                                        | EFI_AUTH_VAR_HEADER_ATTR_TIME_BASED_AUTH_WRITE_ACCESS,
                                        &hVfsFileSigDb);
@@ -974 +974 @@
 
 HRESULT UefiVariableStore::i_uefiVarStoreAddSignatureToDbVec(PCEFI_GUID pGuid, const char *pszDb, const std::vector<BYTE> &aData,
-                                                             const com::Guid &aOwnerUuid, SignatureType_T enmSignatureType)
-{
-    return i_uefiVarStoreAddSignatureToDb(pGuid, pszDb, &aData.front(), aData.size(), aOwnerUuid, enmSignatureType);
+                                                             const com::Guid &aOwnerUuid, SignatureType_T enmSignatureType, bool fRuntime)
+{
+    return i_uefiVarStoreAddSignatureToDb(pGuid, pszDb, &aData.front(), aData.size(), aOwnerUuid, enmSignatureType, fRuntime);
 }