From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.151; helo=mga17.intel.com; envelope-from=jiewen.yao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 164DF22135D5D for ; Tue, 6 Mar 2018 04:58:52 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Mar 2018 05:05:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,431,1515484800"; d="scan'208";a="39609778" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga002.jf.intel.com with ESMTP; 06 Mar 2018 05:05:05 -0800 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 6 Mar 2018 05:05:04 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 6 Mar 2018 05:05:04 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.124]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.130]) with mapi id 14.03.0319.002; Tue, 6 Mar 2018 21:05:02 +0800 From: "Yao, Jiewen" To: "Wu, Hao A" , "edk2-devel@lists.01.org" CC: "Wang, Jian J" , "Zeng, Star" , "Dong, Eric" , "Ni, Ruiyu" Thread-Topic: [PATCH 1/2] MdeModulePkg/Core: Refine handling NULL detection in NX setting Thread-Index: AQHTtURHgTYJMC7GrkGPtBjzA4o31aPDLOxQ Date: Tue, 6 Mar 2018 13:05:02 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503AADE433@shsmsx102.ccr.corp.intel.com> References: <20180306121122.4704-1-hao.a.wu@intel.com> <20180306121122.4704-2-hao.a.wu@intel.com> In-Reply-To: <20180306121122.4704-2-hao.a.wu@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYWNlNWQwN2MtYTAyYy00ZWRmLTg1MmUtYzhkZTJjMWY5ZmNkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjIuNS4xOCIsIlRydXN0ZWRMYWJlbEhhc2giOiJYXC9FS2p5cEVROXBXUHNvMkV1UWNuRVpaQStBZFVIcyt0WnJ3aVdob1JsemF6TmJ3akZGRWoxaVU4aU5seEJIdCJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 1/2] MdeModulePkg/Core: Refine handling NULL detection in NX setting X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Mar 2018 12:58:52 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable reviewed-by: Jiewen.yao@intel.com > -----Original Message----- > From: Wu, Hao A > Sent: Tuesday, March 6, 2018 8:11 PM > To: edk2-devel@lists.01.org > Cc: Wu, Hao A ; Wang, Jian J ; > Zeng, Star ; Dong, Eric ; Yao, > Jiewen ; Ni, Ruiyu > Subject: [PATCH 1/2] MdeModulePkg/Core: Refine handling NULL detection in > NX setting >=20 > The commit rewrites the logic in function > InitializeDxeNxMemoryProtectionPolicy() for handling the first page > (page 0) when NULL pointer detection feature is enabled. >=20 > Instead of skip setting the page 0, the codes will now override the > attribute setting of page 0 by adding the 'EFI_MEMORY_RP' attribute. >=20 > The purpose is to make it easy for other special handlings of pages > (e.g. the first page of the stack when stack guard feature is enabled). >=20 > Cc: Jian J Wang > Cc: Star Zeng > Cc: Eric Dong > Cc: Jiewen Yao > Cc: Ruiyu Ni > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Hao Wu > --- > MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c | 22 > +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) >=20 > diff --git a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c > b/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c > index 455ed35f9a..a2ea445eef 100644 > --- a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c > +++ b/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c > @@ -19,7 +19,7 @@ >=20 > Once the image is unloaded, the protection is removed automatically. >=20 > -Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.
> This program and the accompanying materials > are licensed and made available under the terms and conditions of the BS= D > License > which accompanies this distribution. The full text of the license may b= e found > at > @@ -846,23 +846,23 @@ InitializeDxeNxMemoryProtectionPolicy ( >=20 > Attributes =3D GetPermissionAttributeForMemoryType > (MemoryMapEntry->Type); > if (Attributes !=3D 0) { > + SetUefiImageMemoryAttributes ( > + MemoryMapEntry->PhysicalStart, > + LShiftU64 (MemoryMapEntry->NumberOfPages, EFI_PAGE_SHIFT), > + Attributes); > + > if (MemoryMapEntry->PhysicalStart =3D=3D 0 && > PcdGet8 (PcdNullPointerDetectionPropertyMask) !=3D 0) { >=20 > ASSERT (MemoryMapEntry->NumberOfPages > 0); > // > - // Skip page 0 if NULL pointer detection is enabled to avoid att= ributes > - // overwritten. > + // Add EFI_MEMORY_RP attribute for page 0 if NULL pointer > detection is > + // enabled. > // > SetUefiImageMemoryAttributes ( > - MemoryMapEntry->PhysicalStart + EFI_PAGE_SIZE, > - LShiftU64 (MemoryMapEntry->NumberOfPages - 1, > EFI_PAGE_SHIFT), > - Attributes); > - } else { > - SetUefiImageMemoryAttributes ( > - MemoryMapEntry->PhysicalStart, > - LShiftU64 (MemoryMapEntry->NumberOfPages, EFI_PAGE_SHIFT), > - Attributes); > + 0, > + EFI_PAGES_TO_SIZE (1), > + EFI_MEMORY_RP | Attributes); > } > } > MemoryMapEntry =3D NEXT_MEMORY_DESCRIPTOR (MemoryMapEntry, > DescriptorSize); > -- > 2.12.0.windows.1