From patchwork Thu Jun 29 08:18:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106616 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp818403qge; Thu, 29 Jun 2017 01:19:11 -0700 (PDT) X-Received: by 10.84.229.6 with SMTP id b6mr16299563plk.247.1498724351194; Thu, 29 Jun 2017 01:19:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498724351; cv=none; d=google.com; s=arc-20160816; b=IYvE2h3rRqa1icSeDn1f4U/FOumXP9eOe8zjjyHK7gRDV1YqoxwNKaWAKNYif0qFv/ cc/cZrTn52FukJSAWcrfMKH6HJNA4p9lGixQ59c+CE7GoN/UOkA4Z9hUX1SLF93i+May Sqno/iuCXHo+68VPXTD0DXmjrjgWg8LmiQc/O+aN0GqKOveOUBs+JFyFpgldFOkj6nlI st/ZHPmBMJC7FcOQBkKE+Hvya0RiJ1p//KK9OvJA0cKFgiP9WtiSLPzyAL7gTuILRa2O /7MiZ52QQPOOHDDG8JU3aPdwFWgA0S/1cBFQzP5/y01MyyhlAT1R2y2kEDe8rmHoLKGb nBsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=zPi9WsjqgHcILakwHSb0NNe8qqXQAV/gistDq6Tj0Fw=; b=GwhThz/yOY7nLZoX+n/lIFPUrHlsHRTD+r+JBfVho2mYxVBY+ITjJ6gAlaxwP1dfik I4ztavnVGwY80729c4iixF9OnqLLTeg5K6tFeeweAna6XJqv1Z6aZt7zDvJ+ZIr60Deu kPmD0vcLtd6jAog0Prp2Z/9Qeg90SP/KQPsB29Atck03agLJ3+EG4zebmk5vKNHNAPYb 0X5MXQQNfS6mSlMoKAi1UZ+6TbEL8Pf5g8xOj6bS4tnjVaivlaSFH0N6RUn8UHu5hMHC slKHlCiumC3yj/+IYlJ0OBMztCe2ZW5q6me3CS2I6qCOjaKNc4zRAGknAG0MGZHd7l+7 ixGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=KmKQ64Lp; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h68si3195921pfc.73.2017.06.29.01.19.11; Thu, 29 Jun 2017 01:19:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=KmKQ64Lp; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752136AbdF2ITK (ORCPT + 2 others); Thu, 29 Jun 2017 04:19:10 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:33648 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752042AbdF2ITJ (ORCPT ); Thu, 29 Jun 2017 04:19:09 -0400 Received: by mail-wm0-f46.google.com with SMTP id z75so17103157wmc.0 for ; Thu, 29 Jun 2017 01:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UTotW9m3hFPe7MpTkPP7AjLCU6Xa5uOB+VsczY3WayE=; b=KmKQ64Lp+37COIxRGIwqhyDLSqS3kACo/ziAhjWQW8wDUfl96PCuqNLAuHXX4hj/PS KVdlgiEsYSa/pb/pRJpSUHGeDQnXfezM4W14K3u6Sbfep/6XqLbaM1/Qvexx8vZrIJPF Q4XI1bsU3qzOcU68dOjbyMtFSax9f+1vMVrCY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UTotW9m3hFPe7MpTkPP7AjLCU6Xa5uOB+VsczY3WayE=; b=Wj5i2Wyq2lmqnTC02fs054m+7ndvCZpyAlg1ddG2zzVjT96dmAKJwwat6ejFpiJZ5p cEoQcAXK3kQlRg+dBh3ug6iRcbRxf51Fl1Y832wM7DPg4n86hJ+RjhIc7sYJ7BZYz1x8 XOIJ1ckeQ4lrJz0y5qLGU33lfu78nbedfX8ca+hAhwtFI1teu1zISK59Gax5EfVWbPv0 7CcsTxlGdOWkykrq4wt7YGEcqIzQhUmJY5ZUJQjcVjHqhyo+cOwuTncvj7+dRBePTxoi hI2DFtlBGbG/SlKDz7oyl3nBKIO5yP8emZO/ekQvI3Qmxzp3y6mUSkySaxFGbSmU8MR0 DnMA== X-Gm-Message-State: AKS2vOx9VvAgIFh/QgD2hZ95G0o8FyOeCoPCNpr/Fbh2E86SzYw9ZUmB F/Nd48UI9+2YYxWEdajwew== X-Received: by 10.28.12.2 with SMTP id 2mr9849795wmm.39.1498724347256; Thu, 29 Jun 2017 01:19:07 -0700 (PDT) Received: from localhost.localdomain ([196.90.227.203]) by smtp.gmail.com with ESMTPSA id p34sm5268190wrc.66.2017.06.29.01.19.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jun 2017 01:19:06 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk Cc: matt@codeblueprint.co.uk, leif.lindholm@linaro.org, Ard Biesheuvel Subject: [PATCH v2 3/7] arm: efi: replace open coded constants with symbolic ones Date: Thu, 29 Jun 2017 08:18:45 +0000 Message-Id: <20170629081849.15081-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170629081849.15081-1-ard.biesheuvel@linaro.org> References: <20170629081849.15081-1-ard.biesheuvel@linaro.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org Replace the various open coded constants in the EFI PE/COFF header with definitions from pe.h, or expressions based on local symbols. Signed-off-by: Ard Biesheuvel --- arch/arm/boot/compressed/efi-header.S | 128 ++++++++++---------- 1 file changed, 67 insertions(+), 61 deletions(-) -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/compressed/efi-header.S b/arch/arm/boot/compressed/efi-header.S index 309d6198d335..542e1ad432ae 100644 --- a/arch/arm/boot/compressed/efi-header.S +++ b/arch/arm/boot/compressed/efi-header.S @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2015 Linaro Ltd + * Copyright (C) 2013-2017 Linaro Ltd * Authors: Roy Franz * Ard Biesheuvel * @@ -8,6 +8,9 @@ * published by the Free Software Foundation. */ +#include +#include + .macro __nop #ifdef CONFIG_EFI_STUB @ This is almost but not quite a NOP, since it does clobber the @@ -15,7 +18,7 @@ @ PE/COFF expects the magic string "MZ" at offset 0, while the @ ARM/Linux boot protocol expects an executable instruction @ there. - .inst 'M' | ('Z' << 8) | (0x1310 << 16) @ tstne r0, #0x4d000 + .inst MZ_MAGIC | (0x1310 << 16) @ tstne r0, #0x4d000 #else AR_CLASS( mov r0, r0 ) M_CLASS( nop.w ) @@ -34,78 +37,81 @@ @ The only 2 fields of the MSDOS header that are used are this @ PE/COFF offset, and the "MZ" bytes at offset 0x0. @ - .long pe_header - start @ Offset to the PE header. + .long pe_header - start @ Offset to the PE header. pe_header: - .ascii "PE\0\0" + .long PE_MAGIC coff_header: - .short 0x01c2 @ ARM or Thumb - .short 1 @ nr_sections - .long 0 @ TimeDateStamp - .long 0 @ PointerToSymbolTable - .long 0 @ NumberOfSymbols - .short section_table - optional_header - @ SizeOfOptionalHeader - .short 0x306 @ Characteristics. - @ IMAGE_FILE_32BIT_MACHINE | - @ IMAGE_FILE_DEBUG_STRIPPED | - @ IMAGE_FILE_EXECUTABLE_IMAGE | - @ IMAGE_FILE_LINE_NUMS_STRIPPED + .short IMAGE_FILE_MACHINE_THUMB @ Machine + .short section_count @ NumberOfSections + .long 0 @ TimeDateStamp + .long 0 @ PointerToSymbolTable + .long 0 @ NumberOfSymbols + .short section_table - optional_header @ SizeOfOptionalHeader + .short IMAGE_FILE_32BIT_MACHINE | \ + IMAGE_FILE_DEBUG_STRIPPED | \ + IMAGE_FILE_EXECUTABLE_IMAGE | \ + IMAGE_FILE_LINE_NUMS_STRIPPED @ Characteristics optional_header: - .short 0x10b @ PE32 format - .byte 0x02 @ MajorLinkerVersion - .byte 0x14 @ MinorLinkerVersion - .long _end - __efi_start @ SizeOfCode - .long 0 @ SizeOfInitializedData - .long 0 @ SizeOfUninitializedData - .long efi_stub_entry - start @ AddressOfEntryPoint - .long start_offset @ BaseOfCode - .long 0 @ data + .short PE_OPT_MAGIC_PE32 @ PE32 format + .byte 0x02 @ MajorLinkerVersion + .byte 0x14 @ MinorLinkerVersion + .long _end - __efi_start @ SizeOfCode + .long 0 @ SizeOfInitializedData + .long 0 @ SizeOfUninitializedData + .long efi_stub_entry - start @ AddressOfEntryPoint + .long start_offset @ BaseOfCode + .long 0 @ BaseOfData extra_header_fields: - .long 0 @ ImageBase - .long 0x200 @ SectionAlignment - .long 0x200 @ FileAlignment - .short 0 @ MajorOperatingSystemVersion - .short 0 @ MinorOperatingSystemVersion - .short 0 @ MajorImageVersion - .short 0 @ MinorImageVersion - .short 0 @ MajorSubsystemVersion - .short 0 @ MinorSubsystemVersion - .long 0 @ Win32VersionValue + .long 0 @ ImageBase + .long SZ_512 @ SectionAlignment + .long SZ_512 @ FileAlignment + .short 0 @ MajorOsVersion + .short 0 @ MinorOsVersion + .short 0 @ MajorImageVersion + .short 0 @ MinorImageVersion + .short 0 @ MajorSubsystemVersion + .short 0 @ MinorSubsystemVersion + .long 0 @ Win32VersionValue - .long _end - start @ SizeOfImage - .long start_offset @ SizeOfHeaders - .long 0 @ CheckSum - .short 0xa @ Subsystem (EFI application) - .short 0 @ DllCharacteristics - .long 0 @ SizeOfStackReserve - .long 0 @ SizeOfStackCommit - .long 0 @ SizeOfHeapReserve - .long 0 @ SizeOfHeapCommit - .long 0 @ LoaderFlags - .long 0x6 @ NumberOfRvaAndSizes + .long _end - start @ SizeOfImage + .long start_offset @ SizeOfHeaders + .long 0 @ CheckSum + .short IMAGE_SUBSYSTEM_EFI_APPLICATION @ Subsystem + .short 0 @ DllCharacteristics + .long 0 @ SizeOfStackReserve + .long 0 @ SizeOfStackCommit + .long 0 @ SizeOfHeapReserve + .long 0 @ SizeOfHeapCommit + .long 0 @ LoaderFlags + .long (section_table - .) / 8 @ NumberOfRvaAndSizes - .quad 0 @ ExportTable - .quad 0 @ ImportTable - .quad 0 @ ResourceTable - .quad 0 @ ExceptionTable - .quad 0 @ CertificationTable - .quad 0 @ BaseRelocationTable + .quad 0 @ ExportTable + .quad 0 @ ImportTable + .quad 0 @ ResourceTable + .quad 0 @ ExceptionTable + .quad 0 @ CertificationTable + .quad 0 @ BaseRelocationTable section_table: .ascii ".text\0\0\0" - .long _end - __efi_start @ VirtualSize - .long __efi_start @ VirtualAddress - .long _edata - __efi_start @ SizeOfRawData - .long __efi_start @ PointerToRawData - .long 0 @ PointerToRelocations - .long 0 @ PointerToLineNumbers - .short 0 @ NumberOfRelocations - .short 0 @ NumberOfLineNumbers - .long 0xe0000020 @ Characteristics + .long _end - __efi_start @ VirtualSize + .long __efi_start @ VirtualAddress + .long _edata - __efi_start @ SizeOfRawData + .long __efi_start @ PointerToRawData + .long 0 @ PointerToRelocations + .long 0 @ PointerToLineNumbers + .short 0 @ NumberOfRelocations + .short 0 @ NumberOfLineNumbers + .long IMAGE_SCN_CNT_CODE | \ + IMAGE_SCN_MEM_READ | \ + IMAGE_SCN_MEM_WRITE | \ + IMAGE_SCN_MEM_EXECUTE @ Characteristics + + .set section_count, (. - section_table) / 40 .align 9 __efi_start: