From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web11.12153.1678973612178958287 for ; Thu, 16 Mar 2023 06:33:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=IQ72jL9Y; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: quicinc.com, ip: 205.220.180.131, mailfrom: quic_llindhol@quicinc.com) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32G77cBM015760; Thu, 16 Mar 2023 13:33:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=qcppdkim1; bh=bSx5iFNOyZwOllOpPTH2sBpsUFuOTQyRW1Mx4e7cigY=; b=IQ72jL9YnayHaUi04/ufzQt9MyU/pWGZa1SyCclkCfVvoQSEEYX9q7PzkCOMUCPzT8aa UVbXdSVIiYX7+uFFkL8bU2h/1XokQxD6vVQVCiZdADOe3TQvuXoA6U8xdsyLvrvd2856 p4a0ADgSTa7EJByRMDvFPWg8ptMviPw0rOrVBSrejePBYSrNj5M9FWefueIZtvP2Q6K6 1YJPx0OZWiOvnZ7HLW2oZME+TZojStmBHk0FgJxMnKecUYqy07queOKrdAEbwgQmssP8 KGbGELXqg+ScFlI9mNpgg5wULL88AIeWA3SgBd9t0y8SP5ae67Jj+fp1S6fVM7QQa2/i ow== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3pbpya1wp5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Mar 2023 13:33:17 +0000 Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 32GDXGTd006229 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Mar 2023 13:33:16 GMT Received: from qc-i7.hemma.eciton.net (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Thu, 16 Mar 2023 06:33:13 -0700 Date: Thu, 16 Mar 2023 13:33:10 +0000 From: "Leif Lindholm" To: Ard Biesheuvel CC: , Michael Kinney , Liming Gao , Jiewen Yao , Michael Kubacki , Sean Brogan , Rebecca Cran , Sami Mujawar , Taylor Beebe Subject: Re: [PATCH v5 23/38] EmbeddedPkg/PrePiLib AARCH64: Remap DXE core before execution Message-ID: References: <20230313171714.3866151-1-ardb@kernel.org> <20230313171714.3866151-24-ardb@kernel.org> MIME-Version: 1.0 In-Reply-To: <20230313171714.3866151-24-ardb@kernel.org> X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: PvqyiWjuIkN9uC9UaULMwJEEi_8hZURs X-Proofpoint-GUID: PvqyiWjuIkN9uC9UaULMwJEEi_8hZURs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-16_08,2023-03-16_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 mlxlogscore=799 spamscore=0 phishscore=0 bulkscore=0 impostorscore=0 adultscore=0 priorityscore=1501 malwarescore=0 suspectscore=0 clxscore=1015 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303160110 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline On Mon, Mar 13, 2023 at 18:16:59 +0100, Ard Biesheuvel wrote: > Deal with DRAM memory potentially being mapped with non-executable > permissions, by mapping the DXE core code sections explicitly before > launch. Could you add a note about why LoadPeCoffImage/LoadDxeCoreFromFfsFile are made private? / Leif > Signed-off-by: Ard Biesheuvel > --- > EmbeddedPkg/Include/Library/PrePiLib.h | 16 ------ > EmbeddedPkg/Library/PrePiLib/Arm/RemapDxeCore.c | 51 ++++++++++++++++++++ > EmbeddedPkg/Library/PrePiLib/PrePi.h | 13 +++++ > EmbeddedPkg/Library/PrePiLib/PrePiLib.c | 4 ++ > EmbeddedPkg/Library/PrePiLib/PrePiLib.inf | 12 +++++ > EmbeddedPkg/Library/PrePiLib/X86/RemapDxeCore.c | 23 +++++++++ > 6 files changed, 103 insertions(+), 16 deletions(-) > > diff --git a/EmbeddedPkg/Include/Library/PrePiLib.h b/EmbeddedPkg/Include/Library/PrePiLib.h > index 93a9115eac2d..14f2bbc38dae 100644 > --- a/EmbeddedPkg/Include/Library/PrePiLib.h > +++ b/EmbeddedPkg/Include/Library/PrePiLib.h > @@ -758,22 +758,6 @@ AllocateAlignedPages ( > IN UINTN Alignment > ); > > -EFI_STATUS > -EFIAPI > -LoadPeCoffImage ( > - IN VOID *PeCoffImage, > - OUT EFI_PHYSICAL_ADDRESS *ImageAddress, > - OUT UINT64 *ImageSize, > - OUT EFI_PHYSICAL_ADDRESS *EntryPoint > - ); > - > -EFI_STATUS > -EFIAPI > -LoadDxeCoreFromFfsFile ( > - IN EFI_PEI_FILE_HANDLE FileHandle, > - IN UINTN StackSize > - ); > - > EFI_STATUS > EFIAPI > LoadDxeCoreFromFv ( > diff --git a/EmbeddedPkg/Library/PrePiLib/Arm/RemapDxeCore.c b/EmbeddedPkg/Library/PrePiLib/Arm/RemapDxeCore.c > new file mode 100644 > index 000000000000..40d4ed9d77bd > --- /dev/null > +++ b/EmbeddedPkg/Library/PrePiLib/Arm/RemapDxeCore.c > @@ -0,0 +1,51 @@ > +/** @file > + Copyright (c) 2023, Google LLC. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#include "PrePi.h" > + > +#include > + > +/** > + Remap the code section of the DXE core with the read-only and executable > + permissions. > + > + @param ImageContext The image context describing the loaded PE/COFF image > + > +**/ > +VOID > +EFIAPI > +RemapDxeCore ( > + IN CONST PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext > + ) > +{ > + EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr; > + EFI_IMAGE_SECTION_HEADER *Section; > + UINTN Index; > + > + Hdr.Union = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)((UINT8 *)ImageContext->Handle + > + ImageContext->PeCoffHeaderOffset); > + ASSERT (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE); > + > + Section = (EFI_IMAGE_SECTION_HEADER *)((UINT8 *)Hdr.Union + sizeof (UINT32) + > + sizeof (EFI_IMAGE_FILE_HEADER) + > + Hdr.Pe32->FileHeader.SizeOfOptionalHeader > + ); > + > + for (Index = 0; Index < Hdr.Pe32->FileHeader.NumberOfSections; Index++) { > + if ((Section[Index].Characteristics & EFI_IMAGE_SCN_CNT_CODE) != 0) { > + ArmSetMemoryRegionReadOnly ( > + (UINTN)(ImageContext->ImageAddress + Section[Index].VirtualAddress), > + Section[Index].Misc.VirtualSize > + ); > + > + ArmClearMemoryRegionNoExec ( > + (UINTN)(ImageContext->ImageAddress + Section[Index].VirtualAddress), > + Section[Index].Misc.VirtualSize > + ); > + } > + } > +} > diff --git a/EmbeddedPkg/Library/PrePiLib/PrePi.h b/EmbeddedPkg/Library/PrePiLib/PrePi.h > index a00c946512f4..a0f8837d1d37 100644 > --- a/EmbeddedPkg/Library/PrePiLib/PrePi.h > +++ b/EmbeddedPkg/Library/PrePiLib/PrePi.h > @@ -37,4 +37,17 @@ > #define GET_GUID_HOB_DATA(GuidHob) ((VOID *) (((UINT8 *) &((GuidHob)->Name)) + sizeof (EFI_GUID))) > #define GET_GUID_HOB_DATA_SIZE(GuidHob) (((GuidHob)->Header).HobLength - sizeof (EFI_HOB_GUID_TYPE)) > > +/** > + Remap the code section of the DXE core with the read-only and executable > + permissions. > + > + @param ImageContext The image context describing the loaded PE/COFF image > + > +**/ > +VOID > +EFIAPI > +RemapDxeCore ( > + IN CONST PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext > + ); > + > #endif > diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.c b/EmbeddedPkg/Library/PrePiLib/PrePiLib.c > index 3cf866dab248..188ad5c518a8 100644 > --- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.c > +++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.c > @@ -54,6 +54,7 @@ AllocateCodePages ( > return NULL; > } > > +STATIC > EFI_STATUS > EFIAPI > LoadPeCoffImage ( > @@ -105,6 +106,8 @@ LoadPeCoffImage ( > // > InvalidateInstructionCacheRange ((VOID *)(UINTN)*ImageAddress, (UINTN)*ImageSize); > > + RemapDxeCore (&ImageContext); > + > return Status; > } > > @@ -114,6 +117,7 @@ VOID > IN VOID *HobStart > ); > > +STATIC > EFI_STATUS > EFIAPI > LoadDxeCoreFromFfsFile ( > diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf > index 090bfe888f52..2df5928c51d5 100644 > --- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf > +++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf > @@ -31,11 +31,20 @@ [Sources.common] > FwVol.c > PrePiLib.c > > +[Sources.X64, Sources.IA32] > + X86/RemapDxeCore.c > + > +[Sources.AARCH64, Sources.ARM] > + Arm/RemapDxeCore.c > + > [Packages] > MdePkg/MdePkg.dec > EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > > +[Packages.ARM, Packages.AARCH64] > + ArmPkg/ArmPkg.dec > + > [LibraryClasses] > BaseLib > DebugLib > @@ -50,6 +59,9 @@ [LibraryClasses] > PerformanceLib > HobLib > > +[LibraryClasses.ARM, LibraryClasses.AARCH64] > + ArmMmuLib > + > [Guids] > gEfiMemoryTypeInformationGuid > > diff --git a/EmbeddedPkg/Library/PrePiLib/X86/RemapDxeCore.c b/EmbeddedPkg/Library/PrePiLib/X86/RemapDxeCore.c > new file mode 100644 > index 000000000000..1899c050fdec > --- /dev/null > +++ b/EmbeddedPkg/Library/PrePiLib/X86/RemapDxeCore.c > @@ -0,0 +1,23 @@ > +/** @file > + Copyright (c) 2023, Google LLC. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#include "PrePi.h" > + > +/** > + Remap the code section of the DXE core with the read-only and executable > + permissions. > + > + @param ImageContext The image context describing the loaded PE/COFF image > + > +**/ > +VOID > +EFIAPI > +RemapDxeCore ( > + IN CONST PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext > + ) > +{ > +} > -- > 2.39.2 >