From: "Yao, Jiewen" <jiewen.yao@intel.com>
To: "Wang, Jian J" <jian.j.wang@intel.com>,
"Dong, Eric" <eric.dong@intel.com>,
"Zeng, Star" <star.zeng@intel.com>,
"Ni, Ruiyu" <ruiyu.ni@intel.com>,
Laszlo Ersek <lersek@redhat.com>,
"Kinney, Michael D" <michael.d.kinney@intel.com>
Cc: "edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH v4 0/7] Implement heap guard feature
Date: Thu, 9 Nov 2017 02:53:27 +0000 [thread overview]
Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503AA15CB4@shsmsx102.ccr.corp.intel.com> (raw)
In-Reply-To: <D827630B58408649ACB04F44C510003624CAA8F8@SHSMSX103.ccr.corp.intel.com>
That is great.
I have minor suggestion below:
1) Since StaticPaging and HeapGuard are conflicted feature, I suggest we use ASSERT to tell the end user, instead of disable StaticPaging silently.
+ //
+ // Don't mark page table as read-only if heap guard is enabled.
+ //
+ // BIT2: SMM page guard enabled
+ // BIT3: SMM pool guard enabled
+ //
+ if ((PcdGet8 (PcdHeapGuardPropertyMask) & (BIT3 | BIT2)) != 0) {
+ return ;
+ }
+
2) I do not think we need add below in MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf. Would you please double confirm?
+ CpuLib
+ gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ## CONSUMES
With ASSERT added and cleanup in PiSmmCore.inf, reviewed-by: Jiewen.yao@intel.com
Thank you
Yao Jiewen
> -----Original Message-----
> From: Wang, Jian J
> Sent: Thursday, November 9, 2017 10:00 AM
> To: Yao, Jiewen <jiewen.yao@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>; Laszlo Ersek
> <lersek@redhat.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Wang, Jian J <jian.j.wang@intel.com>; edk2-devel@lists.01.org
> Subject: RE: [edk2] [PATCH v4 0/7] Implement heap guard feature
>
> Just a friendly reminder.
>
> The recent commits have fixed two blocking issues for checking in heap guard
> feature.
>
> 6fe575d052e36b243657a5885b5457decac41f03 (BaseCryptLib memory
> overflow)
> cf8197a39d07179027455421a182598bd6989999
> 5df73e2cc8e39da97d56da058667607f1c43acac (AllocateCopyPool memory
> overflow)
> 2a6ede28fd8efd3051794e1f2727a692d2725fe9
> 469293f8ee406f2b0bad2cf3bbbc510b2a1364eb
>
> Please give your r-b if no more comments. I'd be happy to check in this patch
> soon.
>
> Thanks,
> Jian
>
> > -----Original Message-----
> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Jian J
> > Wang
> > Sent: Friday, October 27, 2017 2:12 PM
> > To: edk2-devel@lists.01.org
> > Subject: [edk2] [PATCH v4 0/7] Implement heap guard feature
> >
> > > Path V4 changes:
> > > a. Change names of gEdkiiSmmMemoryAttributeProtocolGuid related
> > > definitions from EFI_ to EDKII_
> > > b. Coding style cleanup
> > > c. Split patches in a more reasonable order and groups
> >
> > > Patch V3 changes:
> > > a. Add new protocol gEdkiiSmmMemoryAttributeProtocolGuid to do
> > > memory attributes update instead of doing it directly in SmmCore
> > > b. Fix GCC build error
> >
> > > Patch V2 changes:
> > > a. Remove local variable initializer with memory copy from globals
> > > b. Change map table dump code to use DEBUG_PAGE|DEBUG_POOL level
> > > message
> > > c. Fix malfunction in 32-bit boot mode
> > > d. Add comment for the use of mOnGuarding
> > > e. Change name of function InitializePageTableLib to
> > > InitializePageTableGlobals
> > > f. Add code in 32-bit code to bypass setting page table to read-only
> > > g. Coding style clean-up
> > >
> >
> > This feature makes use of paging mechanism to add a hidden (not present)
> > page just before and after the allocated memory block. If the code tries
> > to access memory outside of the allocated part, page fault exception will
> > be triggered.
> >
> > This feature is disabled by default and is not recommended to enable it
> > in production build of BIOS.
> >
> > This patch has passed following validations:
> >
> > a. Boot to shell (OVMF, Intel real platform)(32/64)
> > b. Boot to Fedora 25 (64)
> >
> > NT32 emulation platform was not validated with this feature enabled
> > due to the fact that it doesn't support paging which is needed for
> > this feature to work. But all are validated with feature is disabled.
> >
> > Suggested-by: Ayellet Wolman <ayellet.wolman@intel.com>
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
> >
> > Jian J Wang (7):
> > MdeModulePkg/MdeModulePkg.dec,.uni: Add Protocol, PCDs and string
> > tokens
> > MdeModulePkg/SmmMemoryAttribute.h: Add new protocol definitions
> > UefiCpuPkg/CpuDxe: Reduce debug message
> > MdeModulePkg/DxeIpl: Enable paging for heap guard
> > MdeModulePkg/DxeCore: Implement heap guard feature for UEFI
> > UefiCpuPkg/PiSmmCpuDxeSmm: Add SmmMemoryAttribute protocol
> > MdeModulePkg/PiSmmCore: Implement heap guard feature for SMM
> mode
> >
> > MdeModulePkg/Core/Dxe/DxeMain.inf | 4 +
> > MdeModulePkg/Core/Dxe/Mem/HeapGuard.c | 1182
> > ++++++++++++++++
> > MdeModulePkg/Core/Dxe/Mem/HeapGuard.h | 394
> ++++++
> > MdeModulePkg/Core/Dxe/Mem/Imem.h | 38 +-
> > MdeModulePkg/Core/Dxe/Mem/Page.c | 130 +-
> > MdeModulePkg/Core/Dxe/Mem/Pool.c | 154 +-
> > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 1 +
> > MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c | 36 +-
> > MdeModulePkg/Core/PiSmmCore/HeapGuard.c | 1467
> > ++++++++++++++++++++
> > MdeModulePkg/Core/PiSmmCore/HeapGuard.h | 398
> ++++++
> > MdeModulePkg/Core/PiSmmCore/Page.c | 52 +-
> > MdeModulePkg/Core/PiSmmCore/PiSmmCore.c | 7 +-
> > MdeModulePkg/Core/PiSmmCore/PiSmmCore.h | 81 +-
> > MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf | 8 +
> > MdeModulePkg/Core/PiSmmCore/Pool.c | 81 +-
> > MdeModulePkg/Include/Protocol/SmmMemoryAttribute.h | 136 ++
> > MdeModulePkg/MdeModulePkg.dec | 60 +
> > MdeModulePkg/MdeModulePkg.uni | 58 +
> > UefiCpuPkg/CpuDxe/CpuPageTable.c | 5 +-
> > UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c | 10 +
> > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 20 +
> > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 98 ++
> > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf | 2 +
> > UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 163
> +++
> > UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c | 10 +-
> > 25 files changed, 4496 insertions(+), 99 deletions(-)
> > create mode 100644 MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
> > create mode 100644 MdeModulePkg/Core/Dxe/Mem/HeapGuard.h
> > create mode 100644 MdeModulePkg/Core/PiSmmCore/HeapGuard.c
> > create mode 100644 MdeModulePkg/Core/PiSmmCore/HeapGuard.h
> > create mode 100644
> MdeModulePkg/Include/Protocol/SmmMemoryAttribute.h
> >
> > --
> > 2.14.1.windows.1
> >
> > _______________________________________________
> > edk2-devel mailing list
> > edk2-devel@lists.01.org
> > https://lists.01.org/mailman/listinfo/edk2-devel
next prev parent reply other threads:[~2017-11-09 2:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-27 6:11 [PATCH v4 0/7] Implement heap guard feature Jian J Wang
2017-10-27 6:11 ` [PATCH v4 1/7] MdeModulePkg/MdeModulePkg.dec, .uni: Add Protocol, PCDs and string tokens Jian J Wang
2017-10-27 6:11 ` [PATCH v4 2/7] MdeModulePkg/SmmMemoryAttribute.h: Add new protocol definitions Jian J Wang
2017-11-09 5:12 ` Zeng, Star
2017-11-09 5:54 ` Wang, Jian J
2017-10-27 6:11 ` [PATCH v4 3/7] UefiCpuPkg/CpuDxe: Reduce debug message Jian J Wang
2017-10-27 6:11 ` [PATCH v4 4/7] MdeModulePkg/DxeIpl: Enable paging for heap guard Jian J Wang
2017-10-27 6:11 ` [PATCH v4 5/7] MdeModulePkg/DxeCore: Implement heap guard feature for UEFI Jian J Wang
2017-10-27 6:11 ` [PATCH v4 6/7] UefiCpuPkg/PiSmmCpuDxeSmm: Add SmmMemoryAttribute protocol Jian J Wang
2017-10-27 6:11 ` [PATCH v4 7/7] MdeModulePkg/PiSmmCore: Implement heap guard feature for SMM mode Jian J Wang
2017-10-27 17:22 ` [PATCH v4 0/7] Implement heap guard feature Laszlo Ersek
2017-11-09 1:59 ` Wang, Jian J
2017-11-09 2:53 ` Yao, Jiewen [this message]
2017-11-09 3:14 ` Wang, Jian J
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=74D8A39837DF1E4DA445A8C0B3885C503AA15CB4@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