From patchwork Fri Aug 18 19:49:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 110439 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1344714qge; Fri, 18 Aug 2017 12:51:21 -0700 (PDT) X-Received: by 10.84.130.78 with SMTP id 72mr10709175plc.471.1503085881897; Fri, 18 Aug 2017 12:51:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503085881; cv=none; d=google.com; s=arc-20160816; b=tGaLio7bj8ghYd8eBFl75Jdf+otpJPvAeMg7rWQXp1znaPnPHuITabETYt+ZmB3/2A +4wilnVyGlFWZG/70WvmABGYRNMdhho2rTxOjLdXdfRj++HY6+hpjIH/pKK3uCJZZvIs 6ApreWu7+v3v3iS0Jtdqu2a6VA6DzuiOK3NwB28CUgo806AxmfGgcrbrXY2TxI6TGz/Q jGnf2dPjaHUUuSUVUUU2V0edBszhvdCO6gvN82nu+4KthkXsiW2lGX+UHDx4fW+gtriK YujYAnVSFAzGmmANirxmsfe6lHLMnn54eS5Tw3yd4ukxd7UMky22pc8KcPcQFCvjViNI EakA== 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=P9AejXuUQMTxu9RyKCi6DlhrmoQgf09XYztLTXCHdH0=; b=dv+3694WDhU/O096JT9/VTD0JdBEFPf9hGfcCdwI67ALTEiknuCfFdekP0cvqJkdp8 hEMduJZ/ZDZCFmG9Mn9FmWBl1zoygRZyH/ewS1mFVrxgXkXyczY2ykWDqNe1NahGHGjJ BM7qQ7jovn9H/D56dU+nXINvWM/SMfjOaDkxtyjaZwj9YlvYJ9JNoi2OTeNf3eU0zk8P yW3AWFgWdDdWQlK+qrLAk/6ForLNOTwDT+F8BMKFEl3tfZ2lGqhOs2tsCDi9BvCvG7Nr qDWPyeUytJ5N40nY7jVlUAwy8+9dwu/U8ElauOoWZRcyXnHe5EfA9+R4LtqJJo5+pBC4 UcNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K97TsZtR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (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 m61si4383544plb.435.2017.08.18.12.51.21; Fri, 18 Aug 2017 12:51:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K97TsZtR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752594AbdHRTud (ORCPT + 26 others); Fri, 18 Aug 2017 15:50:33 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:37306 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752280AbdHRTu1 (ORCPT ); Fri, 18 Aug 2017 15:50:27 -0400 Received: by mail-wm0-f46.google.com with SMTP id i66so7296365wmg.0 for ; Fri, 18 Aug 2017 12:50:26 -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=P9AejXuUQMTxu9RyKCi6DlhrmoQgf09XYztLTXCHdH0=; b=K97TsZtRKVrTxyiy5DjP1DfaC2YQVasYzQ+UaCk2yrFWNlCYlfgIQxpYBpqemwcqUy lSKSwwT8k0wvqfLbsgwq1blb3LlWorko3OwKwIgsxGV98P9Hav3Oc/PtJQQCNjpx5its 22wDgJmImvAOdzypjC5bfGK7JefPU3XVGNsR0= 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=P9AejXuUQMTxu9RyKCi6DlhrmoQgf09XYztLTXCHdH0=; b=cEd2JKkDBgFnL8C3KyUbiAImWjorAwPFl8YtqjzzE4c9ZfmsXv0zbhwy6swhLiWDSZ TKXg6aUIcgweXfvKSSfdU20UlltODrt1DzIPZxWCrrpiWZ8NI8RnvhmsLsOaZ7WvdiTQ 6WlyX5gpgiXunzMy+q1bUc/lkmwAP1T8Ad6rJg3SA4GdluD2pJzYkUxn/w+wuCeM/GEd XJkoSDeKhHeQzAlX8eez7/rdw8qkZ3mml5oct4VXRf3gfLVp7ccD3xawXRj2j7+r0QX3 tVfWZyFdYSoLEnaMDwQIxJ5dEFpGPZZ5iN3Jo5k3J3yEVVlWSLH2m8ZqAZce547IQZKL Blzw== X-Gm-Message-State: AHYfb5i+iqm82ih1UxOULB0rk4E5ZHvIdiFq73TillwGlPfsinL6W6RL +kjFD9IoflMlnMCo X-Received: by 10.28.232.8 with SMTP id f8mr2352320wmh.24.1503085825703; Fri, 18 Aug 2017 12:50:25 -0700 (PDT) Received: from localhost.localdomain ([154.146.161.128]) by smtp.gmail.com with ESMTPSA id k29sm5571168wrk.56.2017.08.18.12.50.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Aug 2017 12:50:24 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org, Matt Fleming Subject: [PATCH 10/14] arm: efi: replace open coded constants with symbolic ones Date: Fri, 18 Aug 2017 20:49:43 +0100 Message-Id: <20170818194947.19347-11-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170818194947.19347-1-ard.biesheuvel@linaro.org> References: <20170818194947.19347-1-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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. Cc: Matt Fleming Signed-off-by: Ard Biesheuvel --- arch/arm/boot/compressed/efi-header.S | 128 ++++++++++++++++++---------------- 1 file changed, 67 insertions(+), 61 deletions(-) -- 2.11.0 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: