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.136; helo=mga12.intel.com; envelope-from=hao.a.wu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 17EF522283536 for ; Tue, 6 Mar 2018 04:05:14 -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 fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Mar 2018 04:11:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,431,1515484800"; d="scan'208";a="39601311" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.10]) by orsmga002.jf.intel.com with ESMTP; 06 Mar 2018 04:11:26 -0800 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu , Jian J Wang , Star Zeng , Eric Dong , Jiewen Yao , Ruiyu Ni Date: Tue, 6 Mar 2018 20:11:21 +0800 Message-Id: <20180306121122.4704-2-hao.a.wu@intel.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20180306121122.4704-1-hao.a.wu@intel.com> References: <20180306121122.4704-1-hao.a.wu@intel.com> Subject: [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:05:14 -0000 The commit rewrites the logic in function InitializeDxeNxMemoryProtectionPolicy() for handling the first page (page 0) when NULL pointer detection feature is enabled. 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. 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). 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(-) 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 @@ Once the image is unloaded, the protection is removed automatically. -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 BSD License which accompanies this distribution. The full text of the license may be found at @@ -846,23 +846,23 @@ InitializeDxeNxMemoryProtectionPolicy ( Attributes = GetPermissionAttributeForMemoryType (MemoryMapEntry->Type); if (Attributes != 0) { + SetUefiImageMemoryAttributes ( + MemoryMapEntry->PhysicalStart, + LShiftU64 (MemoryMapEntry->NumberOfPages, EFI_PAGE_SHIFT), + Attributes); + if (MemoryMapEntry->PhysicalStart == 0 && PcdGet8 (PcdNullPointerDetectionPropertyMask) != 0) { ASSERT (MemoryMapEntry->NumberOfPages > 0); // - // Skip page 0 if NULL pointer detection is enabled to avoid attributes - // 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 = NEXT_MEMORY_DESCRIPTOR (MemoryMapEntry, DescriptorSize); -- 2.12.0.windows.1