UefiCpuPkg/PiSmmCpu: Restrict access per PcdCpuSmmRestrictedMemoryAccess

Today's behavior is to always restrict access to non-SMRAM regardless
the value of PcdCpuSmmRestrictedMemoryAccess.

Because RAS components require to access all non-SMRAM memory, the
patch changes the code logic to honor PcdCpuSmmRestrictedMemoryAccess
so that only when the PCD is true, the restriction takes affect and
page table memory is also protected.

Because IA32 build doesn't reference this PCD, such restriction
always takes affect in IA32 build.

Signed-off-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
index 69a04dfb23..723fd5042f 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
@@ -1431,15 +1431,17 @@ PerformRemainingTasks (
     //

     SetMemMapAttributes ();

 

-    //

-    // For outside SMRAM, we only map SMM communication buffer or MMIO.

-    //

-    SetUefiMemMapAttributes ();

+    if (IsRestrictedMemoryAccess ()) {

+      //

+      // For outside SMRAM, we only map SMM communication buffer or MMIO.

+      //

+      SetUefiMemMapAttributes ();

 

-    //

-    // Set page table itself to be read-only

-    //

-    SetPageTableAttributes ();

+      //

+      // Set page table itself to be read-only

+      //

+      SetPageTableAttributes ();

+    }

 

     //

     // Configure SMM Code Access Check feature if available.