The list of locked variables is traversed at runtime, hence we must

convert the list when transferring from physical to virtual mode.

Contributed-under: TianoCore Contribution Agreement 1.0

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14425 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 23 insertions, 0 deletions

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableDxe.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableDxe.c
index a2e764cf6..ef53a9614 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableDxe.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableDxe.c
@@ -2,6 +2,7 @@
   Implement all four UEFI Runtime Variable services for the nonvolatile

   and volatile storage space and install variable architecture protocol.

 

+Copyright (C) 2013, Red Hat, Inc.

 Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

@@ -21,6 +22,7 @@ extern VARIABLE_INFO_ENTRY     *gVariableInfo;
 EFI_HANDLE                     mHandle                    = NULL;

 EFI_EVENT                      mVirtualAddressChangeEvent = NULL;

 EFI_EVENT                      mFtwRegistration           = NULL;

+extern LIST_ENTRY              mLockedVariableList;

 extern BOOLEAN                 mEndOfDxe;

 EDKII_VARIABLE_LOCK_PROTOCOL   mVariableLock              = { VariableLockRequestToLock };

 

@@ -220,6 +222,10 @@ VariableClassAddressChangeEvent (
   IN VOID                                 *Context

   )

 {

+  LIST_ENTRY     *Link;

+  VARIABLE_ENTRY *Entry;

+  EFI_STATUS     Status;

+

   EfiConvertPointer (0x0, (VOID **) &mVariableModuleGlobal->FvbInstance->GetBlockSize);

   EfiConvertPointer (0x0, (VOID **) &mVariableModuleGlobal->FvbInstance->GetPhysicalAddress);

   EfiConvertPointer (0x0, (VOID **) &mVariableModuleGlobal->FvbInstance->GetAttributes);

@@ -238,6 +244,23 @@ VariableClassAddressChangeEvent (
   EfiConvertPointer (0x0, (VOID **) &mStorageArea);

   EfiConvertPointer (0x0, (VOID **) &mSerializationRuntimeBuffer);

   EfiConvertPointer (0x0, (VOID **) &mNvVariableCache);

+

+  //

+  // in the list of locked variables, convert the name pointers first

+  //

+  for ( Link = GetFirstNode (&mLockedVariableList)

+      ; !IsNull (&mLockedVariableList, Link)

+      ; Link = GetNextNode (&mLockedVariableList, Link)

+      ) {

+    Entry = BASE_CR (Link, VARIABLE_ENTRY, Link);

+    Status = EfiConvertPointer (0x0, (VOID **) &Entry->Name);

+    ASSERT_EFI_ERROR (Status);

+  }

+  //

+  // second, convert the list itself using UefiRuntimeLib

+  //

+  Status = EfiConvertList (0x0, &mLockedVariableList);

+  ASSERT_EFI_ERROR (Status);

 }