MdeModulePkg/VariableSmm: Add func for Primary Buffer valid check

Add a new function (VariableSmmIsPrimaryBufferValid) to check
Primary Buffer valid or not.

original function (VariableSmmIsBufferOutsideSmmValid) is used to
check the buffer outside MMRAM.

Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Hongbin1 Zhang <hongbin1.zhang@intel.com>
Cc: Wei6 Xu <wei6.xu@intel.com>
Cc: Dun Tan <dun.tan@intel.com>
Cc: Yuanhao Xie <yuanhao.xie@intel.com>

4 files changed, 57 insertions, 6 deletions

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/PrivilegePolymorphic.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/PrivilegePolymorphic.h
index 065c75a642..23e950aaed 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/PrivilegePolymorphic.h
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/PrivilegePolymorphic.h
@@ -7,7 +7,7 @@
   vs. non-privileged driver code.

 

   Copyright (c) 2017, Red Hat, Inc.<BR>

-  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2010 - 2024, Intel Corporation. All rights reserved.<BR>

 

   SPDX-License-Identifier: BSD-2-Clause-Patent

 **/

@@ -123,6 +123,21 @@ MmVariableServiceInitialize (
   );

 

 /**

+  This function checks if the communication buffer is valid.

+

+  @param Buffer The buffer start address to be checked.

+  @param Length The buffer length to be checked.

+

+  @retval TRUE  This buffer is valid.

+  @retval FALSE This buffer is not valid.

+**/

+BOOLEAN

+VariableSmmIsPrimaryBufferValid (

+  IN EFI_PHYSICAL_ADDRESS  Buffer,

+  IN UINT64                Length

+  );

+

+/**

   This function checks if the buffer is valid per processor architecture and

   does not overlap with SMRAM.

 

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
index 5253c328dc..189880c817 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
@@ -14,7 +14,7 @@
   VariableServiceSetVariable(), VariableServiceQueryVariableInfo(), ReclaimForOS(),

   SmmVariableGetStatistics() should also do validation based on its own knowledge.

 

-Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2010 - 2024, Intel Corporation. All rights reserved.<BR>

 Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

@@ -497,8 +497,8 @@ SmmVariableHandler (
     return EFI_SUCCESS;

   }

 

-  if (!VariableSmmIsBufferOutsideSmmValid ((UINTN)CommBuffer, TempCommBufferSize)) {

-    DEBUG ((DEBUG_ERROR, "SmmVariableHandler: SMM communication buffer in SMRAM or overflow!\n"));

+  if (!VariableSmmIsPrimaryBufferValid ((UINTN)CommBuffer, TempCommBufferSize)) {

+    DEBUG ((DEBUG_ERROR, "SmmVariableHandler: SMM Primary Buffer (CommBuffer) is not valid!\n"));

     return EFI_SUCCESS;

   }

 

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.c
index 943993eb67..1e1e933405 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.c
@@ -2,7 +2,7 @@
 

   Parts of the SMM/MM implementation that are specific to standalone MM

 

-Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved. <BR>

+Copyright (c) 2011 - 2024, Intel Corporation. All rights reserved. <BR>

 Copyright (c) 2018, Linaro, Ltd. All rights reserved. <BR>

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

@@ -11,6 +11,24 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "Variable.h"

 

 /**

+  This function checks if the Primary Buffer (CommBuffer) is valid.

+

+  @param Buffer The buffer start address to be checked.

+  @param Length The buffer length to be checked.

+

+  @retval TRUE  This buffer is valid.

+  @retval FALSE This buffer is not valid.

+**/

+BOOLEAN

+VariableSmmIsPrimaryBufferValid (

+  IN EFI_PHYSICAL_ADDRESS  Buffer,

+  IN UINT64                Length

+  )

+{

+  return TRUE;

+}

+

+/**

   This function checks if the buffer is valid per processor architecture and

   does not overlap with SMRAM.

 

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableTraditionalMm.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableTraditionalMm.c
index 0369c3cd01..35f6f4b04f 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableTraditionalMm.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableTraditionalMm.c
@@ -2,7 +2,7 @@
 

   Parts of the SMM/MM implementation that are specific to traditional MM

 

-Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved. <BR>

+Copyright (c) 2011 - 2024, Intel Corporation. All rights reserved. <BR>

 Copyright (c) 2018, Linaro, Ltd. All rights reserved. <BR>

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

@@ -13,6 +13,24 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "Variable.h"

 

 /**

+  This function checks if the Primary Buffer (CommBuffer) is valid.

+

+  @param Buffer The buffer start address to be checked.

+  @param Length The buffer length to be checked.

+

+  @retval TRUE  This buffer is valid.

+  @retval FALSE This buffer is not valid.

+**/

+BOOLEAN

+VariableSmmIsPrimaryBufferValid (

+  IN EFI_PHYSICAL_ADDRESS  Buffer,

+  IN UINT64                Length

+  )

+{

+  return SmmIsBufferOutsideSmmValid (Buffer, Length);

+}

+

+/**

   This function checks if the buffer is valid per processor architecture and

   does not overlap with SMRAM.