Revision: 19046
http://sourceforge.net/p/edk2/code/19046
Author: lersek
Date: 2015-11-30 18:42:05 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
OvmfPkg: LockBoxLib: -D SMM_REQUIRE excludes our fake lockbox
When the user builds OVMF with -D SMM_REQUIRE, our LockBox implementation
must not be used, since it doesn't actually protect data in the LockBox
from the runtime guest OS. Add an according assert to
LockBoxLibInitialize().
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <[email protected]>
Reviewed-by: Paolo Bonzini <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Modified Paths:
--------------
trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf
trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf
trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
Modified: trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf
===================================================================
--- trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf 2015-11-30
18:42:01 UTC (rev 19045)
+++ trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf 2015-11-30
18:42:05 UTC (rev 19046)
@@ -42,3 +42,6 @@
[Pcd]
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize
+
+[FeaturePcd]
+ gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire
Modified: trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf
===================================================================
--- trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf 2015-11-30
18:42:01 UTC (rev 19045)
+++ trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf 2015-11-30
18:42:05 UTC (rev 19046)
@@ -43,3 +43,6 @@
[Pcd]
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize
+
+[FeaturePcd]
+ gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire
Modified: trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
===================================================================
--- trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxLib.c 2015-11-30 18:42:01 UTC
(rev 19045)
+++ trunk/edk2/OvmfPkg/Library/LockBoxLib/LockBoxLib.c 2015-11-30 18:42:05 UTC
(rev 19046)
@@ -44,6 +44,8 @@
{
UINTN NumEntries;
+ ASSERT (!FeaturePcdGet (PcdSmmSmramRequire));
+
if (PcdGet32 (PcdOvmfLockBoxStorageSize) < sizeof (LOCK_BOX_GLOBAL)) {
return RETURN_UNSUPPORTED;
}
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
