From nobody Sun Feb 8 22:06:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+108868+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+108868+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1695171489; cv=none; d=zohomail.com; s=zohoarc; b=CoWZlfY9cfPr2WUaB6cjyiPjkewY2xG2O1BK0HzQFnlpODsE5j0QKTyGqUxw1WcifkRyfYOGi0x92uYlWW79AozjbVaaoVWoXRdj06fJbMpoHCVPMWfpMFoqk5yLDYmObI/Cyi+xiUWEY1EbRY2o1Djw78fie/qJfdW8d+adxIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695171489; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=OO6kCCtW4kctSQpRGkAyS0e4adNyHQbYNaSdtZkPf4c=; b=YZbkzvik0leuzkx/IwTW/Pu4D044sqf3Fnrt9wm9xfoneUb01EyG9a4SssG8H4vRnjMhZpMJCWx5N/s3W+xCpCboLVGx6PncH8W/n8ZkGYgNmvufbkqWjEm5Z5ATV8x42FYKhKrO9gJq9R/tH0oeFDSqJLk6UV4lTIAiZ6ofi4A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+108868+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 169517148978691.8244237126952; Tue, 19 Sep 2023 17:58:09 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=+J2Og0NjBs456ur3ri8M5MsKAczhqPRn1K+sXMR/uIw=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1695171489; v=1; b=DApufl+QcrF5u3++QegSS2gwcdVbpjGbrK2jmLcHmqteL8E/cwjjc6lY1UqEyXqWhcHBL15z 8WbbiJM/j80R3Kt0GffiPcJWj7zccevgVzw+yARjtkCblpJdbY++eJgdFuBevXJiaGlE+ymZgiS odEyZSmC0/3OPKwYpITp6ciM= X-Received: by 127.0.0.2 with SMTP id UiDSYY1788612xnPT9nPAE14; Tue, 19 Sep 2023 17:58:09 -0700 X-Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.26779.1695171488848256323 for ; Tue, 19 Sep 2023 17:58:08 -0700 X-Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1c465d59719so25654895ad.1 for ; Tue, 19 Sep 2023 17:58:08 -0700 (PDT) X-Gm-Message-State: OpcqvMutY01QEfAGpjUpPZSfx1787277AA= X-Google-Smtp-Source: AGHT+IHD+ku1Zc7AKW0mhv5UzjL+9jxclRmds2Itgd1kHy1ilPUT91HFj4o5DwAZpmyH50g+0UESRw== X-Received: by 2002:a17:903:1cb:b0:1b7:e86f:7631 with SMTP id e11-20020a17090301cb00b001b7e86f7631mr1198343plh.19.1695171488217; Tue, 19 Sep 2023 17:58:08 -0700 (PDT) X-Received: from localhost.localdomain ([50.46.253.1]) by smtp.gmail.com with ESMTPSA id 13-20020a170902c24d00b001bb988ac243sm10563576plg.297.2023.09.19.17.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 17:58:07 -0700 (PDT) From: "Taylor Beebe" To: devel@edk2.groups.io Cc: Jian J Wang , Liming Gao , Dandan Bi Subject: [edk2-devel] [PATCH v4 06/28] MdeModulePkg: Apply Protections to the HOB List Date: Tue, 19 Sep 2023 17:57:29 -0700 Message-ID: <20230920005752.2041-7-taylor.d.beebe@gmail.com> In-Reply-To: <20230920005752.2041-1-taylor.d.beebe@gmail.com> References: <20230920005752.2041-1-taylor.d.beebe@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: 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,taylor.d.beebe@gmail.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1695171492012100031 Content-Type: text/plain; charset="utf-8" Because the platform memory protection settings will be stored in the HOB, the HOB list should be marked read-only and non-executable as soon as possible in boot. This patch page-aligns the allocated HOB list in DXE and marks it RO/NX during memory protection initialization. Signed-off-by: Taylor Beebe Cc: Jian J Wang Cc: Liming Gao Cc: Dandan Bi --- MdeModulePkg/Core/Dxe/Gcd/Gcd.c | 18 ++++++------ MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c | 29 ++++++++++++++++++++ 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c b/MdeModulePkg/Core/Dxe/Gcd/Gc= d.c index 792cd2e0af23..72bd036eab1e 100644 --- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c +++ b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c @@ -2764,21 +2764,21 @@ CoreInitializeGcdServices ( } =20 // - // Relocate HOB List to an allocated pool buffer. + // Relocate HOB List to allocated pages. // The relocation should be at after all the tested memory resources add= ed // (except the memory space that covers HOB List) to the memory services, // because the memory resource found in CoreInitializeMemoryServices() // may have not enough remaining resource for HOB List. // - NewHobList =3D AllocateCopyPool ( - (UINTN)PhitHob->EfiFreeMemoryBottom - (UINTN)(*HobStart), - *HobStart - ); - ASSERT (NewHobList !=3D NULL); - - *HobStart =3D NewHobList; - gHobList =3D NewHobList; + NewHobList =3D AllocatePages (EFI_SIZE_TO_PAGES ((UINTN)PhitHob->EfiFree= MemoryBottom - (UINTN)(*HobStart))); + if (NewHobList !=3D NULL) { + CopyMem (NewHobList, *HobStart, (UINTN)PhitHob->EfiFreeMemoryBottom - = (UINTN)(*HobStart)); + *HobStart =3D NewHobList; + } else { + ASSERT (NewHobList !=3D NULL); + } =20 + gHobList =3D *HobStart; if (MemorySpaceMapHobList !=3D NULL) { // // Add and allocate the memory space that covers HOB List to the memor= y services diff --git a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c b/MdeModulePkg/C= ore/Dxe/Misc/MemoryProtection.c index 7cc829b17402..94ed3111688b 100644 --- a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c +++ b/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c @@ -967,6 +967,32 @@ InitializeDxeNxMemoryProtectionPolicy ( } } =20 +/** + Mark the HOB list as read-only and non-executable. +**/ +STATIC +VOID +ProtectHobList ( + VOID + ) +{ + EFI_PEI_HOB_POINTERS Hob; + + Hob.Raw =3D GetHobList (); + + // Find the end of the HOB list. + while (!END_OF_HOB_LIST (Hob)) { + Hob.Raw =3D GET_NEXT_HOB (Hob); + } + + // Protect the HOB list. + SetUefiImageMemoryAttributes ( + (UINTN)gHobList, + ALIGN_VALUE (((UINTN)Hob.Raw + GET_HOB_LENGTH (Hob)) - (UINTN)GetHobLi= st (), EFI_PAGE_SIZE), + EFI_MEMORY_XP | EFI_MEMORY_RO + ); +} + /** A notification for CPU_ARCH protocol. =20 @@ -1007,6 +1033,9 @@ MemoryProtectionCpuArchProtocolNotify ( // HeapGuardCpuArchProtocolNotify (); =20 + // Mark the HOB list XP and RO. + ProtectHobList (); + if (mImageProtectionPolicy =3D=3D 0) { goto Done; } --=20 2.42.0.windows.2 -=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 (#108868): https://edk2.groups.io/g/devel/message/108868 Mute This Topic: https://groups.io/mt/101469943/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-