From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (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 BADEC21C9E7C0 for ; Wed, 5 Jul 2017 23:57:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6275DC04D28B; Thu, 6 Jul 2017 06:59:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6275DC04D28B Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lersek@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 6275DC04D28B Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-108.phx2.redhat.com [10.3.116.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BAD77013A; Thu, 6 Jul 2017 06:59:01 +0000 (UTC) To: "Gao, Liming" , Ard Biesheuvel , "edk2-devel@lists.01.org" Cc: "leif.lindholm@linaro.org" References: <20170705183359.11970-1-ard.biesheuvel@linaro.org> <4A89E2EF3DFEDB4C8BFDE51014F606A14D751DDA@shsmsx102.ccr.corp.intel.com> From: Laszlo Ersek Message-ID: <0ad94de2-07a0-1570-257f-f61266ace41e@redhat.com> Date: Thu, 6 Jul 2017 08:59:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14D751DDA@shsmsx102.ccr.corp.intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 06 Jul 2017 06:59:02 +0000 (UTC) Subject: Re: [PATCH] BaseTools/GenFw: disregard payload in PE debug directory entry size X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2017 06:57:22 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 07/06/17 05:32, Gao, Liming wrote: > Ard and Laszlo: > Thanks for your quick fix. For my patch, I think it only impacts VS tool chain. So, I don't verify GCC tool chain. Sorry for it. > > Reviewed-by: Liming Gao Thanks Liming (and obviously: Ard), pushed as commit 60e85a39fe49. Laszlo >> -----Original Message----- >> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org] >> Sent: Thursday, July 06, 2017 2:34 AM >> To: edk2-devel@lists.01.org; lersek@redhat.com >> Cc: leif.lindholm@linaro.org; Gao, Liming ; Zhu, >> Yonghong ; Ard Biesheuvel >> >> Subject: [PATCH] BaseTools/GenFw: disregard payload in PE debug directory >> entry size >> >> Currently, the PE/COFF conversion routines in GenFw add a so-called >> NB10 CodeView debug record to the image, and update the associated >> directory entry in the PE/COFF optional header to contain its relative >> virtual address (RVA) and size. >> >> However, there are two levels of indirection at work here: the actual >> NB10 CodeView record (which is simply a magic number and some unused >> data fields followed by the NUL terminated filename) is emitted >> separately, and a separate descriptor is emitted that identifies the >> NB10 CodeView record as type EFI_IMAGE_DEBUG_TYPE_CODEVIEW, and >> records >> its size. The directory entry in the PE/COFF optional header should >> refer to this intermediate descriptor's address and size only, but >> the WriteDebug## () routines in GenFw erroneously record the size of >> both the descriptor and the NB10 CodeView record. >> >> This problem was exposed by commit e4129b0e5897 ("BaseTools: Update >> GenFw to clear unused debug entry generated by VS tool chain", >> 2017-06-19), and GenFw now crashes when it attempts to iterate over >> what it thinks are multiple intermediate descriptors for different >> kinds of debug data embedded in the image. >> >> The error is understandable, given that both are carved out of the >> same file space allocation, but this is really an implementation detail >> of GenFw, and is not required. (Note that the intermediate descriptor >> does not require a RVA and so it does not even need to be inside a >> section) >> >> So omit the size of the NB10 CodeView record from the size recorded >> in the optional header. >> >> Link: https://lists.01.org/pipermail/edk2-devel/2017-July/012181.html >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Ard Biesheuvel >> Co-debugged-or-whatever-by: Laszlo Ersek >> --- >> BaseTools/Source/C/GenFw/Elf32Convert.c | 2 +- >> BaseTools/Source/C/GenFw/Elf64Convert.c | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c >> b/BaseTools/Source/C/GenFw/Elf32Convert.c >> index f7b084dc9b84..14fe4a285857 100644 >> --- a/BaseTools/Source/C/GenFw/Elf32Convert.c >> +++ b/BaseTools/Source/C/GenFw/Elf32Convert.c >> @@ -1142,7 +1142,7 @@ WriteDebug32 ( >> NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + >> mNtHdrOffset); >> DataDir = &NtHdr- >>> Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG >> ]; >> DataDir->VirtualAddress = mDebugOffset; >> - DataDir->Size = Dir->SizeOfData + >> sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY); >> + DataDir->Size = sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY); >> } >> >> STATIC >> diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c >> b/BaseTools/Source/C/GenFw/Elf64Convert.c >> index 7eed7b92d30f..c39bdff063ab 100644 >> --- a/BaseTools/Source/C/GenFw/Elf64Convert.c >> +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c >> @@ -1095,7 +1095,7 @@ WriteDebug64 ( >> NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + >> mNtHdrOffset); >> DataDir = &NtHdr- >>> Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DE >> BUG]; >> DataDir->VirtualAddress = mDebugOffset; >> - DataDir->Size = Dir->SizeOfData + >> sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY); >> + DataDir->Size = sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY); >> } >> >> STATIC >> -- >> 2.9.3 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel >