Changeset 77662 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/LockBox/SmmLockBox

Timestamp:

Mar 12, 2019 12:40:12 PM (6 years ago)

Author:

vboxsync

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

129295

Message:

EFI: First step in UDK2018 merge. Does not build yet.

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c (modified) (7 diffs)
• MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni (modified) (1 diff)
• MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni (modified) (1 diff)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c

@@ -10 +10 @@
   will receive untrusted input and do basic validation.
 
-Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
 
 This program and the accompanying materials
@@ -77 +77 @@
     return ;
   }
+  //
+  // The AsmLfence() call here is to ensure the above range check for the
+  // CommBuffer have been completed before calling into SaveLockBox().
+  //
+  AsmLfence ();
 
   //
@@ -161 +166 @@
     return ;
   }
+  //
+  // The AsmLfence() call here is to ensure the above range check for the
+  // CommBuffer have been completed before calling into UpdateLockBox().
+  //
+  AsmLfence ();
 
   //
@@ -218 +228 @@
                (UINTN *)&TempLockBoxParameterRestore.Length
                );
+    if (Status == EFI_BUFFER_TOO_SMALL) {
+      LockBoxParameterRestore->Length = TempLockBoxParameterRestore.Length;
+    }
   }
   LockBoxParameterRestore->Header.ReturnStatus = (UINT64)Status;
@@ -268 +281 @@
   UINTN                             TempCommBufferSize;
 
-  DEBUG ((EFI_D_ERROR, "SmmLockBox SmmLockBoxHandler Enter\n"));
+  DEBUG ((DEBUG_INFO, "SmmLockBox SmmLockBoxHandler Enter\n"));
 
   //
@@ -295 +308 @@
   LockBoxParameterHeader->ReturnStatus = (UINT64)-1;
 
-  DEBUG ((EFI_D_ERROR, "SmmLockBox LockBoxParameterHeader - %x\n", (UINTN)LockBoxParameterHeader));
-
-  DEBUG ((EFI_D_ERROR, "SmmLockBox Command - %x\n", (UINTN)LockBoxParameterHeader->Command));
+  DEBUG ((DEBUG_INFO, "SmmLockBox LockBoxParameterHeader - %x\n", (UINTN)LockBoxParameterHeader));
+
+  DEBUG ((DEBUG_INFO, "SmmLockBox Command - %x\n", (UINTN)LockBoxParameterHeader->Command));
 
   switch (LockBoxParameterHeader->Command) {
@@ -342 +355 @@
   LockBoxParameterHeader->Command = (UINT32)-1;
 
-  DEBUG ((EFI_D_ERROR, "SmmLockBox SmmLockBoxHandler Exit\n"));
+  DEBUG ((DEBUG_INFO, "SmmLockBox SmmLockBoxHandler Exit\n"));
 
   return EFI_SUCCESS;

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni

@@ -1 @@
-// /** @file
+// /** @file
 // LockBox SMM driver.
 //

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni

@@ -1 @@
-// /** @file
+// /** @file
 // SmmLockBox Localized Strings and Content
 //