1 files changed, 14 insertions, 0 deletions
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index b3c36992e3..a4104cc228 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -2418,6 +2418,8 @@ VariableLockRequestToLock (
 {
   VARIABLE_ENTRY                  *Entry;
   CHAR16                          *Name;
+  LIST_ENTRY                      *Link;
+  VARIABLE_ENTRY                  *LockedEntry;
 
   if (VariableName == NULL || VariableName[0] == 0 || VendorGuid == NULL) {
     return EFI_INVALID_PARAMETER;
@@ -2436,11 +2438,23 @@ VariableLockRequestToLock (
 
   AcquireLockOnlyAtBootTime(&mVariableModuleGlobal->VariableGlobal.VariableServicesLock);
 
+  for ( Link = GetFirstNode (&mLockedVariableList)
+      ; !IsNull (&mLockedVariableList, Link)
+      ; Link = GetNextNode (&mLockedVariableList, Link)
+      ) {
+    LockedEntry = BASE_CR (Link, VARIABLE_ENTRY, Link);
+    Name = (CHAR16 *) ((UINTN) LockedEntry + sizeof (*LockedEntry));
+    if (CompareGuid (&LockedEntry->Guid, VendorGuid) && (StrCmp (Name, VariableName) == 0)) {
+      goto Done;
+    }
+  }
+
   Name = (CHAR16 *) ((UINTN) Entry + sizeof (*Entry));
   StrnCpy   (Name, VariableName, StrLen (VariableName));
   CopyGuid (&Entry->Guid, VendorGuid);
   InsertTailList (&mLockedVariableList, &Entry->Link);
 
+Done:
   ReleaseLockOnlyAtBootTime (&mVariableModuleGlobal->VariableGlobal.VariableServicesLock);
 
   return EFI_SUCCESS;