From: "Dong, Eric" <eric.dong@intel.com>
To: "Zeng, Star" <star.zeng@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [Patch v2] MdeModulePkg/PiSmmCore: Check valid memory range.
Date: Wed, 22 Aug 2018 12:56:21 +0000 [thread overview]
Message-ID: <ED077930C258884BBCB450DB737E66224AC93733@shsmsx102.ccr.corp.intel.com> (raw)
In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103BBB0E98@shsmsx102.ccr.corp.intel.com>
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
prev parent reply other threads:[~2018-08-22 12:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-21 12:24 [Patch v2] MdeModulePkg/PiSmmCore: Check valid memory range Eric Dong
2018-08-22 11:11 ` Zeng, Star
2018-08-22 12:56 ` Dong, Eric [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ED077930C258884BBCB450DB737E66224AC93733@shsmsx102.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox