X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=SecurityPkg%2FVariableAuthenticated%2FEsalVariableDxeSal%2FVariable.c;h=d0269c9da744d9e8112c99d2f1ee131592bdbc3b;hp=d6c66863512b58e0b65c865c541d3d91ab2a3443;hb=4f8ef5ce4ee883756bede7c134f14cda12ca248e;hpb=0c18794ea4289f03fefc7117b56740414cc0536c;ds=sidebyside

diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c b/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
index d6c6686351..d0269c9da7 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
+++ b/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
@@ -846,6 +846,7 @@ UpdateVariableCache (
           // If size of data changes, allocate pool and copy data.
           //
           Entry->Data = AllocatePool (DataSize);
+          ASSERT (Entry->Data != NULL);
           Entry->DataSize = DataSize;
           CopyMem (Entry->Data, Data, DataSize);
         }
@@ -2937,6 +2938,58 @@ ReclaimForOS(
   }
 }
 
+/**
+  Flush the HOB variable to NV variable storage.
+**/
+VOID
+FlushHob2Nv (
+  VOID
+  )
+{
+  EFI_STATUS                      Status;
+  VOID                            *GuidHob;
+  VARIABLE_STORE_HEADER           *VariableStoreHeader;
+  VARIABLE_HEADER                 *VariableHeader;
+  //
+  // Get HOB variable store.
+  //
+  GuidHob = GetFirstGuidHob (&gEfiAuthenticatedVariableGuid);
+  if (GuidHob != NULL) {
+    VariableStoreHeader = (VARIABLE_STORE_HEADER *) GET_GUID_HOB_DATA (GuidHob);
+    if (CompareGuid (&VariableStoreHeader->Signature, &gEfiAuthenticatedVariableGuid) &&
+        (VariableStoreHeader->Format == VARIABLE_STORE_FORMATTED) &&
+        (VariableStoreHeader->State == VARIABLE_STORE_HEALTHY)
+       ) {
+      DEBUG ((EFI_D_INFO, "HOB Variable Store appears to be valid.\n"));
+      //
+      // Flush the HOB variable to NV Variable storage.
+      //
+      for ( VariableHeader = (VARIABLE_HEADER *) HEADER_ALIGN (VariableStoreHeader + 1)
+          ; (VariableHeader < (VARIABLE_HEADER *) HEADER_ALIGN ((UINTN) VariableStoreHeader + VariableStoreHeader->Size)
+            &&
+            (VariableHeader->StartId == VARIABLE_DATA))
+          ; VariableHeader = (VARIABLE_HEADER *) HEADER_ALIGN ((UINTN) (VariableHeader + 1)
+                           + VariableHeader->NameSize + GET_PAD_SIZE (VariableHeader->NameSize)
+                           + VariableHeader->DataSize + GET_PAD_SIZE (VariableHeader->DataSize)
+                           )
+          ) {
+        ASSERT (VariableHeader->State == VAR_ADDED);
+        ASSERT ((VariableHeader->Attributes & EFI_VARIABLE_NON_VOLATILE) != 0);
+        Status = EsalSetVariable (
+                   (CHAR16 *) (VariableHeader + 1),
+                   &VariableHeader->VendorGuid,
+                   VariableHeader->Attributes,
+                   VariableHeader->DataSize,
+                   (UINT8 *) (VariableHeader + 1) + VariableHeader->NameSize + GET_PAD_SIZE (VariableHeader->NameSize),
+                   Physical,
+                   mVariableModuleGlobal
+                   );
+        ASSERT_EFI_ERROR (Status);
+      }
+    }
+  }
+}
+
 /**
   Initializes variable store area for non-volatile and volatile variable.