From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (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 81D7A21CAD998 for ; Mon, 6 Aug 2018 05:53:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B8CF07C6A9; Mon, 6 Aug 2018 12:53:13 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-121-82.rdu2.redhat.com [10.10.121.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F6092026D74; Mon, 6 Aug 2018 12:53:12 +0000 (UTC) To: "Zeng, Star" , "Ni, Ruiyu" , "edk2-devel@lists.01.org" References: <20180806095659.250456-1-ruiyu.ni@intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103BB8D348@shsmsx102.ccr.corp.intel.com> From: Laszlo Ersek Message-ID: <3e0c56b7-726a-2d53-9b1d-4705af3af733@redhat.com> Date: Mon, 6 Aug 2018 14:53:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103BB8D348@shsmsx102.ccr.corp.intel.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 06 Aug 2018 12:53:13 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 06 Aug 2018 12:53:13 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH] IntelFrameworkModulePkg/Csm: Set CSM memory executable X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Aug 2018 12:53:15 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 08/06/18 12:20, Zeng, Star wrote: > Cc Jian. Right; I believe a non-empty commit message would be helpful. (Issue description, circumstances of the failure, what the exact edk2 security feature or setting is that the current LegacyBiosDxe code conflicts with, ...) Thanks, Laszlo > Thanks, > Star > > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ruiyu Ni > Sent: Monday, August 6, 2018 5:57 PM > To: edk2-devel@lists.01.org > Cc: Zeng, Star > Subject: [edk2] [PATCH] IntelFrameworkModulePkg/Csm: Set CSM memory executable > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni > Cc: Star Zeng > --- > .../Csm/LegacyBiosDxe/LegacyBios.c | 22 +++++++++++++++++----- > 1 file changed, 17 insertions(+), 5 deletions(-) > > diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c > index 8f14687b28..f86d00b53f 100644 > --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c > +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c > @@ -64,8 +64,9 @@ AllocateLegacyMemory ( > OUT EFI_PHYSICAL_ADDRESS *Result > ) > { > - EFI_STATUS Status; > - EFI_PHYSICAL_ADDRESS MemPage; > + EFI_STATUS Status; > + EFI_PHYSICAL_ADDRESS MemPage; > + EFI_GCD_MEMORY_SPACE_DESCRIPTOR MemDesc; > > // > // Allocate Pages of memory less <= StartPageAddress @@ -83,10 +84,21 @@ AllocateLegacyMemory ( > // > if (!EFI_ERROR (Status)) { > *Result = (EFI_PHYSICAL_ADDRESS) (UINTN) MemPage; > + if (MemoryType != EfiBootServicesCode) { > + // > + // Make sure that the buffer can be used to store code. > + // > + Status = gDS->GetMemorySpaceDescriptor (MemPage, &MemDesc); > + if (!EFI_ERROR (Status) && (MemDesc.Attributes & EFI_MEMORY_XP) != 0) { > + Status = gDS->SetMemorySpaceAttributes ( > + MemPage, > + EFI_PAGES_TO_SIZE (Pages), > + MemDesc.Attributes & (~EFI_MEMORY_XP) > + ); > + } > + } > } > - // > - // If reach here the status = EFI_SUCCESS > - // > + > return Status; > } > > -- > 2.16.1.windows.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel >