[Patch v2] MdeModulePkg/PiSmmCore: Check valid memory range.

[Patch v2] MdeModulePkg/PiSmmCore: Check valid memory range.

[Eric Dong]

Call BS.AllocatePages in DXE driver and call SMM FreePages with the address of the buffer allocated in the DXE driver. SMM FreePages success and add a non-SMRAM range into SMM heap list. This is not an expected behavior. SMM FreePages should return error for this case and not free the pages.

V2 changes:
  Adjust "Last" variable value from "Last = Memory + EFI_PAGES_TO_SIZE (NumberOfPages);" to "Last = Memory + EFI_PAGES_TO_SIZE (NumberOfPages) - 1;"

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1098

Pass test:
1. Call SmmAllocatePages, to allocate pages, then call SmmFreePages to free same pages return success.
2. Call AllocatePages in Dxe then call SmmFreePages to free same pages, return failure.

Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
---
 MdeModulePkg/Core/PiSmmCore/Page.c | 39 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/MdeModulePkg/Core/PiSmmCore/Page.c b/MdeModulePkg/Core/PiSmmCore/Page.c
index 3699af7424..e9fcf01ecc 100644
--- a/MdeModulePkg/Core/PiSmmCore/Page.c
+++ b/MdeModulePkg/Core/PiSmmCore/Page.c
@@ -983,6 +983,41 @@ SmmInternalFreePages (
   return SmmInternalFreePagesEx (Memory, NumberOfPages, FALSE);
 }
 
+/**
+  Check whether the input range is in smram.
+
+  @param  Memory                 Base address of memory being inputed.
+  @param  NumberOfPages          The number of pages.
+
+  @retval TRUE   In the smram.
+  @retval FALSE  Not in the smram.
+
+**/
+BOOLEAN
+InSmmRange (
+  IN EFI_PHYSICAL_ADDRESS  Memory,
+  IN UINTN                 NumberOfPages
+  )
+{
+  LIST_ENTRY               *Link;
+  MEMORY_MAP               *Entry;
+  EFI_PHYSICAL_ADDRESS     Last;
+
+  Last = Memory + EFI_PAGES_TO_SIZE (NumberOfPages) - 1;
+
+  Link = gMemoryMap.ForwardLink;
+  while (Link != &gMemoryMap) {
+    Entry = CR (Link, MEMORY_MAP, Link, MEMORY_MAP_SIGNATURE);
+    Link  = Link->ForwardLink;
+
+    if ((Entry->Start <= Memory) && (Entry->End >= Last)) {
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
 /**
   Frees previous allocated pages.
 
@@ -1004,6 +1039,10 @@ SmmFreePages (
   EFI_STATUS  Status;
   BOOLEAN     IsGuarded;
 
+  if (!InSmmRange(Memory, NumberOfPages)) {
+    return EFI_NOT_FOUND;
+  }
+
   IsGuarded = IsHeapGuardEnabled () && IsMemoryGuarded (Memory);
   Status = SmmInternalFreePages (Memory, NumberOfPages, IsGuarded);
   if (!EFI_ERROR (Status)) {
-- 
2.15.0.windows.1

Re: [Patch v2] MdeModulePkg/PiSmmCore: Check valid memory range.

[Zeng, Star]

Suggest use "InMemMap" instead of "InSmmRange", Reviewed-by: Star Zeng <star.zeng@intel.com> with it.


Thanks,
Star
-----Original Message-----
From: Dong, Eric 
Sent: Tuesday, August 21, 2018 8:25 PM
To: edk2-devel@lists.01.org
Cc: Zeng, Star <star.zeng@intel.com>
Subject: [Patch v2] MdeModulePkg/PiSmmCore: Check valid memory range.

Call BS.AllocatePages in DXE driver and call SMM FreePages with the address of the buffer allocated in the DXE driver. SMM FreePages success and add a non-SMRAM range into SMM heap list. This is not an expected behavior. SMM FreePages should return error for this case and not free the pages.

V2 changes:
  Adjust "Last" variable value from "Last = Memory + EFI_PAGES_TO_SIZE (NumberOfPages);" to "Last = Memory + EFI_PAGES_TO_SIZE (NumberOfPages) - 1;"

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1098

Pass test:
1. Call SmmAllocatePages, to allocate pages, then call SmmFreePages to free same pages return success.
2. Call AllocatePages in Dxe then call SmmFreePages to free same pages, return failure.

Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
---
 MdeModulePkg/Core/PiSmmCore/Page.c | 39 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/MdeModulePkg/Core/PiSmmCore/Page.c b/MdeModulePkg/Core/PiSmmCore/Page.c
index 3699af7424..e9fcf01ecc 100644
--- a/MdeModulePkg/Core/PiSmmCore/Page.c
+++ b/MdeModulePkg/Core/PiSmmCore/Page.c
@@ -983,6 +983,41 @@ SmmInternalFreePages (
   return SmmInternalFreePagesEx (Memory, NumberOfPages, FALSE);  }
 
+/**
+  Check whether the input range is in smram.
+
+  @param  Memory                 Base address of memory being inputed.
+  @param  NumberOfPages          The number of pages.
+
+  @retval TRUE   In the smram.
+  @retval FALSE  Not in the smram.
+
+**/
+BOOLEAN
+InSmmRange (
+  IN EFI_PHYSICAL_ADDRESS  Memory,
+  IN UINTN                 NumberOfPages
+  )
+{
+  LIST_ENTRY               *Link;
+  MEMORY_MAP               *Entry;
+  EFI_PHYSICAL_ADDRESS     Last;
+
+  Last = Memory + EFI_PAGES_TO_SIZE (NumberOfPages) - 1;
+
+  Link = gMemoryMap.ForwardLink;
+  while (Link != &gMemoryMap) {
+    Entry = CR (Link, MEMORY_MAP, Link, MEMORY_MAP_SIGNATURE);
+    Link  = Link->ForwardLink;
+
+    if ((Entry->Start <= Memory) && (Entry->End >= Last)) {
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
 /**
   Frees previous allocated pages.
 
@@ -1004,6 +1039,10 @@ SmmFreePages (
   EFI_STATUS  Status;
   BOOLEAN     IsGuarded;
 
+  if (!InSmmRange(Memory, NumberOfPages)) {
+    return EFI_NOT_FOUND;
+  }
+
   IsGuarded = IsHeapGuardEnabled () && IsMemoryGuarded (Memory);
   Status = SmmInternalFreePages (Memory, NumberOfPages, IsGuarded);
   if (!EFI_ERROR (Status)) {
--
2.15.0.windows.1

Re: [Patch v2] MdeModulePkg/PiSmmCore: Check valid memory range.

[Dong, Eric]

Hi Star,

Agree, will update to that name when check in the code.

Thanks,
Eric

> -----Original Message-----
> From: Zeng, Star
> Sent: Wednesday, August 22, 2018 7:11 PM
> To: Dong, Eric <eric.dong@intel.com>; edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>
> Subject: RE: [Patch v2] MdeModulePkg/PiSmmCore: Check valid memory
> range.
> 
> Suggest use "InMemMap" instead of "InSmmRange", Reviewed-by: Star Zeng
> <star.zeng@intel.com> with it.
> 
> 
> Thanks,
> Star
> -----Original Message-----
> From: Dong, Eric
> Sent: Tuesday, August 21, 2018 8:25 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>
> Subject: [Patch v2] MdeModulePkg/PiSmmCore: Check valid memory range.
> 
> Call BS.AllocatePages in DXE driver and call SMM FreePages with the address
> of the buffer allocated in the DXE driver. SMM FreePages success and add a
> non-SMRAM range into SMM heap list. This is not an expected behavior.
> SMM FreePages should return error for this case and not free the pages.
> 
> V2 changes:
>   Adjust "Last" variable value from "Last = Memory + EFI_PAGES_TO_SIZE
> (NumberOfPages);" to "Last = Memory + EFI_PAGES_TO_SIZE
> (NumberOfPages) - 1;"
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1098
> 
> Pass test:
> 1. Call SmmAllocatePages, to allocate pages, then call SmmFreePages to free
> same pages return success.
> 2. Call AllocatePages in Dxe then call SmmFreePages to free same pages,
> return failure.
> 
> Cc: Star Zeng <star.zeng@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Dong <eric.dong@intel.com>
> ---
>  MdeModulePkg/Core/PiSmmCore/Page.c | 39
> ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)
> 
> diff --git a/MdeModulePkg/Core/PiSmmCore/Page.c
> b/MdeModulePkg/Core/PiSmmCore/Page.c
> index 3699af7424..e9fcf01ecc 100644
> --- a/MdeModulePkg/Core/PiSmmCore/Page.c
> +++ b/MdeModulePkg/Core/PiSmmCore/Page.c
> @@ -983,6 +983,41 @@ SmmInternalFreePages (
>    return SmmInternalFreePagesEx (Memory, NumberOfPages, FALSE);  }
> 
> +/**
> +  Check whether the input range is in smram.
> +
> +  @param  Memory                 Base address of memory being inputed.
> +  @param  NumberOfPages          The number of pages.
> +
> +  @retval TRUE   In the smram.
> +  @retval FALSE  Not in the smram.
> +
> +**/
> +BOOLEAN
> +InSmmRange (
> +  IN EFI_PHYSICAL_ADDRESS  Memory,
> +  IN UINTN                 NumberOfPages
> +  )
> +{
> +  LIST_ENTRY               *Link;
> +  MEMORY_MAP               *Entry;
> +  EFI_PHYSICAL_ADDRESS     Last;
> +
> +  Last = Memory + EFI_PAGES_TO_SIZE (NumberOfPages) - 1;
> +
> +  Link = gMemoryMap.ForwardLink;
> +  while (Link != &gMemoryMap) {
> +    Entry = CR (Link, MEMORY_MAP, Link, MEMORY_MAP_SIGNATURE);
> +    Link  = Link->ForwardLink;
> +
> +    if ((Entry->Start <= Memory) && (Entry->End >= Last)) {
> +      return TRUE;
> +    }
> +  }
> +
> +  return FALSE;
> +}
> +
>  /**
>    Frees previous allocated pages.
> 
> @@ -1004,6 +1039,10 @@ SmmFreePages (
>    EFI_STATUS  Status;
>    BOOLEAN     IsGuarded;
> 
> +  if (!InSmmRange(Memory, NumberOfPages)) {
> +    return EFI_NOT_FOUND;
> +  }
> +
>    IsGuarded = IsHeapGuardEnabled () && IsMemoryGuarded (Memory);
>    Status = SmmInternalFreePages (Memory, NumberOfPages, IsGuarded);
>    if (!EFI_ERROR (Status)) {
> --
> 2.15.0.windows.1