From nobody Mon Feb 9 01:20:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+62204+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+62204+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1594176393; cv=none; d=zohomail.com; s=zohoarc; b=MYFkx4hRH24h+OKu1GKoxvOLBgrv7avRq7HkdayefDvCogcqH1kqqmjeTycmybttpkE7A+zkC+bLOSssglVZWCe/aHTx5e6uWzlCFSx357doi3jtWvimP4q6KRUn2TNMtgZHelTitz5aeOI6wezqbdqh5od4oXyI8eZBr3C0Urc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594176393; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=bu88gUwm0a5KS3aUTrZ7RiKSKmvp5oX1XCpKI1atMT0=; b=RF0YMZfJNPVqp8UJ79p5en34Vte6BDPz4k94x5bVgs8T4X3sz8qFV6gcv+oMIlZrzgX23+BaC4zKj5hWuiN0XMPNYMmwZhNoHNHkofilpdKMW6PswkI7fr6tb7dJTOugbGIgI/2806GY6tqNGoc3Zq/SbKTtD9YsMwtc4jHZ0Z0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+62204+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1594176393843740.2240107007567; Tue, 7 Jul 2020 19:46:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id yA8VYY1788612xH9wXLpNqNP; Tue, 07 Jul 2020 19:46:33 -0700 X-Received: from mga09.intel.com (mga09.intel.com []) by mx.groups.io with SMTP id smtpd.web10.2988.1594176375248160105 for ; Tue, 07 Jul 2020 19:46:32 -0700 IronPort-SDR: GY1IArhoJMDTcDDsFm0yquwmxPi8W7pylTi61+QTzOU93q6kDI9m+MW2uSk1hdrTycq+znUn2V PzncFZ5SGIfQ== X-IronPort-AV: E=McAfee;i="6000,8403,9675"; a="149242222" X-IronPort-AV: E=Sophos;i="5.75,326,1589266800"; d="scan'208";a="149242222" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2020 19:46:32 -0700 IronPort-SDR: vZHorvwZZsDnvvQfdQkNnb4HwSlukp/Hmx555e9LywHAvLUU96e7WLjl83VQBqgwYXof9Lo17+ wmfbVoBNh1xw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,326,1589266800"; d="scan'208";a="483271645" X-Received: from guominji-mobl.ccr.corp.intel.com ([10.238.4.95]) by fmsmga006.fm.intel.com with ESMTP; 07 Jul 2020 19:46:30 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek , Rahul Kumar Subject: [edk2-devel] [PATCH v3 10/11] UefiCpuPkg/CpuMpPei: Enable paging and set NP flag to avoid TOCTOU (CVE-2019-11098) Date: Wed, 8 Jul 2020 10:46:07 +0800 Message-Id: <20200708024608.915-11-guomin.jiang@intel.com> In-Reply-To: <20200708024608.915-1-guomin.jiang@intel.com> References: <20200708024608.915-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guomin.jiang@intel.com X-Gm-Message-State: AM3UUZk38u4ZdDsm1T6ihpo3x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1594176393; bh=otvbhufrxWYS5Exk8RjdwDq5YZ6IcxLvdTWsjuR9YBE=; h=Cc:Date:From:Reply-To:Subject:To; b=Mp7D2vqOluCe+Anabk4nzBwfLua5dyI/biTv0lgw0SutDRJRMkjTk4tfurkb/NSOTbE LNyuwFsHJEDpZt9JrWXZu0TPz7of7zN7PRCtEbYk+ioM0b8DKDxCMIP3GLdwetmyg1jzG eLQGIta0auuCuzS5tKDoGOrA5V+ZCunIfpo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1614 To avoid the TOCTOU, enable paging and set Not Present flag so when access any code in the flash range, it will trigger #NP exception. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Rahul Kumar Signed-off-by: Guomin Jiang --- UefiCpuPkg/CpuMpPei/CpuMpPei.inf | 3 +++ UefiCpuPkg/CpuMpPei/CpuPaging.c | 21 +++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf b/UefiCpuPkg/CpuMpPei/CpuMpPe= i.inf index f4d11b861f77..7e511325d8b8 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.inf @@ -46,6 +46,9 @@ [LibraryClasses] BaseMemoryLib CpuLib =20 +[Guids] + gEdkiiMigratedFvInfoGuid ## = SOMETIMES_CONSUMES ## HOB + [Ppis] gEfiPeiMpServicesPpiGuid ## PRODUCES gEfiSecPlatformInformationPpiGuid ## SOMETIMES_CONSUMES diff --git a/UefiCpuPkg/CpuMpPei/CpuPaging.c b/UefiCpuPkg/CpuMpPei/CpuPagin= g.c index 3bf0574b34c6..783bdacc7fb9 100644 --- a/UefiCpuPkg/CpuMpPei/CpuPaging.c +++ b/UefiCpuPkg/CpuMpPei/CpuPaging.c @@ -12,6 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include +#include =20 #include "CpuMpPei.h" =20 @@ -605,6 +606,8 @@ MemoryDiscoveredPpiNotifyCallback ( EFI_STATUS Status; BOOLEAN InitStackGuard; BOOLEAN InterruptState; + EDKII_MIGRATED_FV_INFO *MigratedFvInfo; + EFI_PEI_HOB_POINTERS Hob; =20 if (PcdGetBool (PcdMigrateTemporaryRamFirmwareVolumes)) { InterruptState =3D SaveAndDisableInterrupts (); @@ -619,9 +622,14 @@ MemoryDiscoveredPpiNotifyCallback ( // the task switch (for the sake of stack switch). // InitStackGuard =3D FALSE; - if (IsIa32PaeSupported () && PcdGetBool (PcdCpuStackGuard)) { + Hob.Raw =3D NULL; + if (IsIa32PaeSupported ()) { + Hob.Raw =3D GetFirstGuidHob (&gEdkiiMigratedFvInfoGuid); + InitStackGuard =3D PcdGetBool (PcdCpuStackGuard); + } + + if (InitStackGuard || Hob.Raw !=3D NULL) { EnablePaging (); - InitStackGuard =3D TRUE; } =20 Status =3D InitializeCpuMpWorker ((CONST EFI_PEI_SERVICES **)PeiServices= ); @@ -631,6 +639,15 @@ MemoryDiscoveredPpiNotifyCallback ( SetupStackGuardPage (); } =20 + while (Hob.Raw !=3D NULL) { + MigratedFvInfo =3D GET_GUID_HOB_DATA (Hob); + ConvertMemoryPageAttributes (MigratedFvInfo->FvOrgBase, MigratedFvInfo= ->FvLength, 0); + + Hob.Raw =3D GET_NEXT_HOB (Hob); + Hob.Raw =3D GetNextGuidHob (&gEdkiiMigratedFvInfoGuid, Hob.Raw); + } + CpuFlushTlb (); + return Status; } =20 --=20 2.25.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#62204): https://edk2.groups.io/g/devel/message/62204 Mute This Topic: https://groups.io/mt/75369629/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-