On 05/12/20 08:46, Michael Kubacki wrote:
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> REF:https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.tianocore.org%2Fshow_bug.cgi%3Fid%3D2522&data=02%7C01%7Cbret.barkelew%40microsoft.com%7C98d423482cea4e143c4308d7f66b0927%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637248811886928541&sdata=GlpxfE6%2FzZR01KXRvOoaXQTQEG%2F3TNuaZxJ6C1fl6LI%3D&reserved=0
>
> The 12 patches in this series add the VariablePolicy feature to the core,
> deprecate Edk2VarLock (while adding a compatibility layer to reduce code
> churn), and integrate the VariablePolicy libraries and protocols into
> Variable Services.
>
> Since the integration requires multiple changes, including adding libraries,
> a protocol, an SMI communication handler, and VariableServices integration,
> the patches are broken up by individual library additions and then a final
> integration. Security-sensitive changes like bypassing Authenticated
> Variable enforcement are also broken out into individual patches so that
> attention can be called directly to them.
>
> Platform porting instructions are described in this wiki entry:
>
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Ftianocore%2Ftianocore.github.io%2Fwiki%2FVariablePolicy-Protocol---Enhanced-Method-for-Managing-Variables%23platform-porting&data=02%7C01%7Cbret.barkelew%40microsoft.com%7C98d423482cea4e143c4308d7f66b0927%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637248811886928541&sdata=o%2FraXnHgx4RMreIkSFSONm8He0CzM7ZTXoV8loOrxe0%3D&reserved=0
(1) This wiki article is helpful, thanks.
I have one remark: there's a heading saying "VarCheckPolicyLib NULL
Instance":
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Ftianocore%2Ftianocore.github.io%2Fwiki%2FVariablePolicy-Protocol---Enhanced-Method-for-Managing-Variables%23varcheckpolicylib-null-instance&data=02%7C01%7Cbret.barkelew%40microsoft.com%7C98d423482cea4e143c4308d7f66b0927%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637248811886928541&sdata=4qTYEB6%2F3uJnLZ9MjRHODQGaaPq6zZEp7bFlCXEP7gI%3D&reserved=0
I think what's meant is "NULL class", not "NULL instance".
(2) The following platform DSC files in edk2 include the non-SMM
variable driver
("MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf"),
but they are not modified by this patch series:
ArmVirtPkg/ArmVirtQemu.dsc
ArmVirtPkg/ArmVirtQemuKernel.dsc
ArmVirtPkg/ArmVirtXen.dsc
OvmfPkg/OvmfXen.dsc
UefiPayloadPkg/UefiPayloadPkgIa32.dsc
UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
I'm asking that you please (a) include a patch for ArmVirtPkg, (b)
update the OvmfPkg patch to cover "OvmfXen.dsc" too.
Not sure about the UefiPayloadPkg platforms; please ask their maintainers.
(I've CC'd the OvmfXen and UefiPayloadPkg maintainers/reviewers.)
Thanks,
Laszlo
>
> Discussion of the feature can be found in multiple places throughout
> the last year on the RFC channel, staging branches, and in devel.
>
> Most recently, this subject was discussed in this thread:
>
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fedk2.groups.io%2Fg%2Fdevel%2Fmessage%2F53712&data=02%7C01%7Cbret.barkelew%40microsoft.com%7C98d423482cea4e143c4308d7f66b0927%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637248811886938531&sdata=%2FFmQMtE%2Ffrl6UxNdY94mvckwrXVUJySJ%2BWFSSQp8nCk%3D&reserved=0
> (the code branches shared in that discussion are now out of date, but the
> whitepapers and discussion are relevant).
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
>
> Changes since v1:
> * Fixed implementation for RuntimeDxe
> * Add PCD to block DisableVariablePolicy
> * Fix the DumpVariablePolicy pagination in SMM
>
> Bret Barkelew (12):
> MdeModulePkg: Define the VariablePolicy protocol interface
> MdeModulePkg: Define the VariablePolicyLib
> MdeModulePkg: Define the VariablePolicyHelperLib
> MdeModulePkg: Define the VarCheckPolicyLib and SMM interface
> MdeModulePkg: Connect VariablePolicy business logic to
> VariableServices
> MdeModulePkg: Allow VariablePolicy state to delete protected variables
> SecurityPkg: Allow VariablePolicy state to delete authenticated
> variables
> MdeModulePkg: Change TCG MOR variables to use VariablePolicy
> MdeModulePkg: Drop VarLock from RuntimeDxe variable driver
> MdeModulePkg: Add a shell-based functional test for VariablePolicy
> OvmfPkg: Add VariablePolicy engine to OvmfPkg platform
> EmulatorPkg: Add VariablePolicy engine to EmulatorPkg platform
>
> MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.c | 318 +++
> MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.c | 396 ++++
> MdeModulePkg/Library/VariablePolicyLib/VariablePolicyExtraInitNull.c | 46 +
> MdeModulePkg/Library/VariablePolicyLib/VariablePolicyExtraInitRuntimeDxe.c | 85 +
> MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.c | 806 +++++++
> MdeModulePkg/Library/VariablePolicyLib/VariablePolicyUnitTest/VariablePolicyUnitTest.c | 2285 ++++++++++++++++++++
> MdeModulePkg/Test/ShellTest/VariablePolicyFuncTestApp/VariablePolicyFuncTestApp.c | 1942 +++++++++++++++++
> MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockDxe.c | 52 +-
> MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c | 60 +-
> MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c | 49 +-
> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c | 53 +
> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableLockRequstToLock.c | 71 +
> MdeModulePkg/Universal/Variable/RuntimeDxe/VariablePolicySmmDxe.c | 653 ++++++
> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c | 14 +
> SecurityPkg/Library/AuthVariableLib/AuthService.c | 22 +-
> EmulatorPkg/EmulatorPkg.dsc | 6 +
> MdeModulePkg/Include/Guid/VarCheckPolicyMmi.h | 54 +
> MdeModulePkg/Include/Library/VariablePolicyHelperLib.h | 164 ++
> MdeModulePkg/Include/Library/VariablePolicyLib.h | 207 ++
> MdeModulePkg/Include/Protocol/VariablePolicy.h | 157 ++
> MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.inf | 44 +
> MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.uni | 12 +
> MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf | 36 +
> MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.uni | 12 +
> MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf | 44 +
> MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.uni | 12 +
> MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf | 52 +
> MdeModulePkg/Library/VariablePolicyLib/VariablePolicyUnitTest/VariablePolicyUnitTest.inf | 41 +
> MdeModulePkg/MdeModulePkg.ci.yaml | 4 +-
> MdeModulePkg/MdeModulePkg.dec | 26 +-
> MdeModulePkg/MdeModulePkg.dsc | 15 +
> MdeModulePkg/Test/MdeModulePkgHostTest.dsc | 11 +
> MdeModulePkg/Test/ShellTest/VariablePolicyFuncTestApp/Readme.md | 55 +
> MdeModulePkg/Test/ShellTest/VariablePolicyFuncTestApp/VariablePolicyFuncTestApp.inf | 42 +
> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf | 5 +
> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf | 4 +
> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf | 12 +
> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf | 4 +
> OvmfPkg/OvmfPkgIa32.dsc | 8 +
> OvmfPkg/OvmfPkgIa32X64.dsc | 8 +
> OvmfPkg/OvmfPkgX64.dsc | 8 +
> SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf | 2 +
> 42 files changed, 7819 insertions(+), 78 deletions(-)
> create mode 100644 MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.c
> create mode 100644 MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.c
> create mode 100644 MdeModulePkg/Library/VariablePolicyLib/VariablePolicyExtraInitNull.c
> create mode 100644 MdeModulePkg/Library/VariablePolicyLib/VariablePolicyExtraInitRuntimeDxe.c
> create mode 100644 MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.c
> create mode 100644 MdeModulePkg/Library/VariablePolicyLib/VariablePolicyUnitTest/VariablePolicyUnitTest.c
> create mode 100644 MdeModulePkg/Test/ShellTest/VariablePolicyFuncTestApp/VariablePolicyFuncTestApp.c
> create mode 100644 MdeModulePkg/Universal/Variable/RuntimeDxe/VariableLockRequstToLock.c
> create mode 100644 MdeModulePkg/Universal/Variable/RuntimeDxe/VariablePolicySmmDxe.c
> create mode 100644 MdeModulePkg/Include/Guid/VarCheckPolicyMmi.h
> create mode 100644 MdeModulePkg/Include/Library/VariablePolicyHelperLib.h
> create mode 100644 MdeModulePkg/Include/Library/VariablePolicyLib.h
> create mode 100644 MdeModulePkg/Include/Protocol/VariablePolicy.h
> create mode 100644 MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.inf
> create mode 100644 MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.uni
> create mode 100644 MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
> create mode 100644 MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.uni
> create mode 100644 MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
> create mode 100644 MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.uni
> create mode 100644 MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
> create mode 100644 MdeModulePkg/Library/VariablePolicyLib/VariablePolicyUnitTest/VariablePolicyUnitTest.inf
> create mode 100644 MdeModulePkg/Test/ShellTest/VariablePolicyFuncTestApp/Readme.md
> create mode 100644 MdeModulePkg/Test/ShellTest/VariablePolicyFuncTestApp/VariablePolicyFuncTestApp.inf
>