* [PATCH 1/9] pkcs7: Forward declare struct key in pkcs7.h
2014-07-03 21:07 [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Vivek Goyal
@ 2014-07-03 21:07 ` Vivek Goyal
2014-07-03 21:07 ` [PATCH 2/9] Provide PE binary definitions Vivek Goyal
` (8 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Vivek Goyal @ 2014-07-03 21:07 UTC (permalink / raw)
To: linux-kernel
Cc: ebiederm, hpa, mjg59, greg, bp, dyoung, chaowang, bhe, akpm,
dhowells, pjones, Vivek Goyal
Do a forward declaration of "struct key" in pkcs.h as one of the functions
takes pointer to struct key as argument.
Otherwise when I include this header file in some other .c file where
key.h is not included, I get following warning later in the series.
In file included from arch/x86/kernel/mscode_parser.c:17:0:
include/crypto/pkcs7.h:30:5: warning: ‘struct key’ declared inside parameter list [enabled by default]
bool *_trusted);
^
include/crypto/pkcs7.h:30:5: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
include/crypto/pkcs7.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/crypto/pkcs7.h b/include/crypto/pkcs7.h
index 167f914..4c227e3 100644
--- a/include/crypto/pkcs7.h
+++ b/include/crypto/pkcs7.h
@@ -10,6 +10,7 @@
*/
struct pkcs7_message;
+struct key;
/*
* pkcs7_parser.c
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 2/9] Provide PE binary definitions
2014-07-03 21:07 [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Vivek Goyal
2014-07-03 21:07 ` [PATCH 1/9] pkcs7: Forward declare struct key in pkcs7.h Vivek Goyal
@ 2014-07-03 21:07 ` Vivek Goyal
2014-07-04 19:12 ` Anca Emanuel
2014-07-03 21:07 ` [PATCH 3/9] pefile: Parse a PE binary and verify signature Vivek Goyal
` (7 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Vivek Goyal @ 2014-07-03 21:07 UTC (permalink / raw)
To: linux-kernel
Cc: ebiederm, hpa, mjg59, greg, bp, dyoung, chaowang, bhe, akpm,
dhowells, pjones, Vivek Goyal
Provide some PE binary structural and constant definitions as taken from the
pesign package sources.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
include/linux/pe.h | 448 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 448 insertions(+)
create mode 100644 include/linux/pe.h
diff --git a/include/linux/pe.h b/include/linux/pe.h
new file mode 100644
index 0000000..e170b95
--- /dev/null
+++ b/include/linux/pe.h
@@ -0,0 +1,448 @@
+/*
+ * Copyright 2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author(s): Peter Jones <pjones@redhat.com>
+ */
+#ifndef __LINUX_PE_H
+#define __LINUX_PE_H
+
+#include <linux/types.h>
+
+#define MZ_MAGIC 0x5a4d /* "MZ" */
+
+struct mz_hdr {
+ uint16_t magic; /* MZ_MAGIC */
+ uint16_t lbsize; /* size of last used block */
+ uint16_t blocks; /* pages in file, 0x3 */
+ uint16_t relocs; /* relocations */
+ uint16_t hdrsize; /* header size in "paragraphs" */
+ uint16_t min_extra_pps; /* .bss */
+ uint16_t max_extra_pps; /* runtime limit for the arena size */
+ uint16_t ss; /* relative stack segment */
+ uint16_t sp; /* initial %sp register */
+ uint16_t checksum; /* word checksum */
+ uint16_t ip; /* initial %ip register */
+ uint16_t cs; /* initial %cs relative to load segment */
+ uint16_t reloc_table_offset; /* offset of the first relocation */
+ uint16_t overlay_num; /* overlay number. set to 0. */
+ uint16_t reserved0[4]; /* reserved */
+ uint16_t oem_id; /* oem identifier */
+ uint16_t oem_info; /* oem specific */
+ uint16_t reserved1[10]; /* reserved */
+ uint32_t peaddr; /* address of pe header */
+ char message[64]; /* message to print */
+};
+
+struct mz_reloc {
+ uint16_t offset;
+ uint16_t segment;
+};
+
+#define PE_MAGIC 0x00004550 /* "PE\0\0" */
+#define PE_OPT_MAGIC_PE32 0x010b
+#define PE_OPT_MAGIC_PE32_ROM 0x0107
+#define PE_OPT_MAGIC_PE32PLUS 0x020b
+
+/* machine type */
+#define IMAGE_FILE_MACHINE_UNKNOWN 0x0000
+#define IMAGE_FILE_MACHINE_AM33 0x01d3
+#define IMAGE_FILE_MACHINE_AMD64 0x8664
+#define IMAGE_FILE_MACHINE_ARM 0x01c0
+#define IMAGE_FILE_MACHINE_ARMV7 0x01c4
+#define IMAGE_FILE_MACHINE_EBC 0x0ebc
+#define IMAGE_FILE_MACHINE_I386 0x014c
+#define IMAGE_FILE_MACHINE_IA64 0x0200
+#define IMAGE_FILE_MACHINE_M32R 0x9041
+#define IMAGE_FILE_MACHINE_MIPS16 0x0266
+#define IMAGE_FILE_MACHINE_MIPSFPU 0x0366
+#define IMAGE_FILE_MACHINE_MIPSFPU16 0x0466
+#define IMAGE_FILE_MACHINE_POWERPC 0x01f0
+#define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1
+#define IMAGE_FILE_MACHINE_R4000 0x0166
+#define IMAGE_FILE_MACHINE_SH3 0x01a2
+#define IMAGE_FILE_MACHINE_SH3DSP 0x01a3
+#define IMAGE_FILE_MACHINE_SH3E 0x01a4
+#define IMAGE_FILE_MACHINE_SH4 0x01a6
+#define IMAGE_FILE_MACHINE_SH5 0x01a8
+#define IMAGE_FILE_MACHINE_THUMB 0x01c2
+#define IMAGE_FILE_MACHINE_WCEMIPSV2 0x0169
+
+/* flags */
+#define IMAGE_FILE_RELOCS_STRIPPED 0x0001
+#define IMAGE_FILE_EXECUTABLE_IMAGE 0x0002
+#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004
+#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008
+#define IMAGE_FILE_AGGRESSIVE_WS_TRIM 0x0010
+#define IMAGE_FILE_LARGE_ADDRESS_AWARE 0x0020
+#define IMAGE_FILE_16BIT_MACHINE 0x0040
+#define IMAGE_FILE_BYTES_REVERSED_LO 0x0080
+#define IMAGE_FILE_32BIT_MACHINE 0x0100
+#define IMAGE_FILE_DEBUG_STRIPPED 0x0200
+#define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP 0x0400
+#define IMAGE_FILE_NET_RUN_FROM_SWAP 0x0800
+#define IMAGE_FILE_SYSTEM 0x1000
+#define IMAGE_FILE_DLL 0x2000
+#define IMAGE_FILE_UP_SYSTEM_ONLY 0x4000
+#define IMAGE_FILE_BYTES_REVERSED_HI 0x8000
+
+struct pe_hdr {
+ uint32_t magic; /* PE magic */
+ uint16_t machine; /* machine type */
+ uint16_t sections; /* number of sections */
+ uint32_t timestamp; /* time_t */
+ uint32_t symbol_table; /* symbol table offset */
+ uint32_t symbols; /* number of symbols */
+ uint16_t opt_hdr_size; /* size of optional header */
+ uint16_t flags; /* flags */
+};
+
+#define IMAGE_FILE_OPT_ROM_MAGIC 0x107
+#define IMAGE_FILE_OPT_PE32_MAGIC 0x10b
+#define IMAGE_FILE_OPT_PE32_PLUS_MAGIC 0x20b
+
+#define IMAGE_SUBSYSTEM_UNKNOWN 0
+#define IMAGE_SUBSYSTEM_NATIVE 1
+#define IMAGE_SUBSYSTEM_WINDOWS_GUI 2
+#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3
+#define IMAGE_SUBSYSTEM_POSIX_CUI 7
+#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI 9
+#define IMAGE_SUBSYSTEM_EFI_APPLICATION 10
+#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11
+#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12
+#define IMAGE_SUBSYSTEM_EFI_ROM_IMAGE 13
+#define IMAGE_SUBSYSTEM_XBOX 14
+
+#define IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE 0x0040
+#define IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY 0x0080
+#define IMAGE_DLL_CHARACTERISTICS_NX_COMPAT 0x0100
+#define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200
+#define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400
+#define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800
+#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER 0x2000
+#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000
+
+/* the fact that pe32 isn't padded where pe32+ is 64-bit means union won't
+ * work right. vomit. */
+struct pe32_opt_hdr {
+ /* "standard" header */
+ uint16_t magic; /* file type */
+ uint8_t ld_major; /* linker major version */
+ uint8_t ld_minor; /* linker minor version */
+ uint32_t text_size; /* size of text section(s) */
+ uint32_t data_size; /* size of data section(s) */
+ uint32_t bss_size; /* size of bss section(s) */
+ uint32_t entry_point; /* file offset of entry point */
+ uint32_t code_base; /* relative code addr in ram */
+ uint32_t data_base; /* relative data addr in ram */
+ /* "windows" header */
+ uint32_t image_base; /* preferred load address */
+ uint32_t section_align; /* alignment in bytes */
+ uint32_t file_align; /* file alignment in bytes */
+ uint16_t os_major; /* major OS version */
+ uint16_t os_minor; /* minor OS version */
+ uint16_t image_major; /* major image version */
+ uint16_t image_minor; /* minor image version */
+ uint16_t subsys_major; /* major subsystem version */
+ uint16_t subsys_minor; /* minor subsystem version */
+ uint32_t win32_version; /* reserved, must be 0 */
+ uint32_t image_size; /* image size */
+ uint32_t header_size; /* header size rounded up to
+ file_align */
+ uint32_t csum; /* checksum */
+ uint16_t subsys; /* subsystem */
+ uint16_t dll_flags; /* more flags! */
+ uint32_t stack_size_req;/* amt of stack requested */
+ uint32_t stack_size; /* amt of stack required */
+ uint32_t heap_size_req; /* amt of heap requested */
+ uint32_t heap_size; /* amt of heap required */
+ uint32_t loader_flags; /* reserved, must be 0 */
+ uint32_t data_dirs; /* number of data dir entries */
+};
+
+struct pe32plus_opt_hdr {
+ uint16_t magic; /* file type */
+ uint8_t ld_major; /* linker major version */
+ uint8_t ld_minor; /* linker minor version */
+ uint32_t text_size; /* size of text section(s) */
+ uint32_t data_size; /* size of data section(s) */
+ uint32_t bss_size; /* size of bss section(s) */
+ uint32_t entry_point; /* file offset of entry point */
+ uint32_t code_base; /* relative code addr in ram */
+ /* "windows" header */
+ uint64_t image_base; /* preferred load address */
+ uint32_t section_align; /* alignment in bytes */
+ uint32_t file_align; /* file alignment in bytes */
+ uint16_t os_major; /* major OS version */
+ uint16_t os_minor; /* minor OS version */
+ uint16_t image_major; /* major image version */
+ uint16_t image_minor; /* minor image version */
+ uint16_t subsys_major; /* major subsystem version */
+ uint16_t subsys_minor; /* minor subsystem version */
+ uint32_t win32_version; /* reserved, must be 0 */
+ uint32_t image_size; /* image size */
+ uint32_t header_size; /* header size rounded up to
+ file_align */
+ uint32_t csum; /* checksum */
+ uint16_t subsys; /* subsystem */
+ uint16_t dll_flags; /* more flags! */
+ uint64_t stack_size_req;/* amt of stack requested */
+ uint64_t stack_size; /* amt of stack required */
+ uint64_t heap_size_req; /* amt of heap requested */
+ uint64_t heap_size; /* amt of heap required */
+ uint32_t loader_flags; /* reserved, must be 0 */
+ uint32_t data_dirs; /* number of data dir entries */
+};
+
+struct data_dirent {
+ uint32_t virtual_address; /* relative to load address */
+ uint32_t size;
+};
+
+struct data_directory {
+ struct data_dirent exports; /* .edata */
+ struct data_dirent imports; /* .idata */
+ struct data_dirent resources; /* .rsrc */
+ struct data_dirent exceptions; /* .pdata */
+ struct data_dirent certs; /* certs */
+ struct data_dirent base_relocations; /* .reloc */
+ struct data_dirent debug; /* .debug */
+ struct data_dirent arch; /* reservered */
+ struct data_dirent global_ptr; /* global pointer reg. Size=0 */
+ struct data_dirent tls; /* .tls */
+ struct data_dirent load_config; /* load configuration structure */
+ struct data_dirent bound_imports; /* no idea */
+ struct data_dirent import_addrs; /* import address table */
+ struct data_dirent delay_imports; /* delay-load import table */
+ struct data_dirent clr_runtime_hdr; /* .cor (object only) */
+ struct data_dirent reserved;
+};
+
+struct section_header {
+ char name[8]; /* name or "/12\0" string tbl offset */
+ uint32_t virtual_size; /* size of loaded section in ram */
+ uint32_t virtual_address; /* relative virtual address */
+ uint32_t raw_data_size; /* size of the section */
+ uint32_t data_addr; /* file pointer to first page of sec */
+ uint32_t relocs; /* file pointer to relocation entries */
+ uint32_t line_numbers; /* line numbers! */
+ uint16_t num_relocs; /* number of relocations */
+ uint16_t num_lin_numbers; /* srsly. */
+ uint32_t flags;
+};
+
+/* they actually defined 0x00000000 as well, but I think we'll skip that one. */
+#define IMAGE_SCN_RESERVED_0 0x00000001
+#define IMAGE_SCN_RESERVED_1 0x00000002
+#define IMAGE_SCN_RESERVED_2 0x00000004
+#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 /* don't pad - obsolete */
+#define IMAGE_SCN_RESERVED_3 0x00000010
+#define IMAGE_SCN_CNT_CODE 0x00000020 /* .text */
+#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 /* .data */
+#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 /* .bss */
+#define IMAGE_SCN_LNK_OTHER 0x00000100 /* reserved */
+#define IMAGE_SCN_LNK_INFO 0x00000200 /* .drectve comments */
+#define IMAGE_SCN_RESERVED_4 0x00000400
+#define IMAGE_SCN_LNK_REMOVE 0x00000800 /* .o only - scn to be rm'd*/
+#define IMAGE_SCN_LNK_COMDAT 0x00001000 /* .o only - COMDAT data */
+#define IMAGE_SCN_RESERVED_5 0x00002000 /* spec omits this */
+#define IMAGE_SCN_RESERVED_6 0x00004000 /* spec omits this */
+#define IMAGE_SCN_GPREL 0x00008000 /* global pointer referenced data */
+/* spec lists 0x20000 twice, I suspect they meant 0x10000 for one of them */
+#define IMAGE_SCN_MEM_PURGEABLE 0x00010000 /* reserved for "future" use */
+#define IMAGE_SCN_16BIT 0x00020000 /* reserved for "future" use */
+#define IMAGE_SCN_LOCKED 0x00040000 /* reserved for "future" use */
+#define IMAGE_SCN_PRELOAD 0x00080000 /* reserved for "future" use */
+/* and here they just stuck a 1-byte integer in the middle of a bitfield */
+#define IMAGE_SCN_ALIGN_1BYTES 0x00100000 /* it does what it says on the box */
+#define IMAGE_SCN_ALIGN_2BYTES 0x00200000
+#define IMAGE_SCN_ALIGN_4BYTES 0x00300000
+#define IMAGE_SCN_ALIGN_8BYTES 0x00400000
+#define IMAGE_SCN_ALIGN_16BYTES 0x00500000
+#define IMAGE_SCN_ALIGN_32BYTES 0x00600000
+#define IMAGE_SCN_ALIGN_64BYTES 0x00700000
+#define IMAGE_SCN_ALIGN_128BYTES 0x00800000
+#define IMAGE_SCN_ALIGN_256BYTES 0x00900000
+#define IMAGE_SCN_ALIGN_512BYTES 0x00a00000
+#define IMAGE_SCN_ALIGN_1024BYTES 0x00b00000
+#define IMAGE_SCN_ALIGN_2048BYTES 0x00c00000
+#define IMAGE_SCN_ALIGN_4096BYTES 0x00d00000
+#define IMAGE_SCN_ALIGN_8192BYTES 0x00e00000
+#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 /* extended relocations */
+#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 /* scn can be discarded */
+#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 /* cannot be cached */
+#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 /* not pageable */
+#define IMAGE_SCN_MEM_SHARED 0x10000000 /* can be shared */
+#define IMAGE_SCN_MEM_EXECUTE 0x20000000 /* can be executed as code */
+#define IMAGE_SCN_MEM_READ 0x40000000 /* readable */
+#define IMAGE_SCN_MEM_WRITE 0x80000000 /* writeable */
+
+enum x64_coff_reloc_type {
+ IMAGE_REL_AMD64_ABSOLUTE = 0,
+ IMAGE_REL_AMD64_ADDR64,
+ IMAGE_REL_AMD64_ADDR32,
+ IMAGE_REL_AMD64_ADDR32N,
+ IMAGE_REL_AMD64_REL32,
+ IMAGE_REL_AMD64_REL32_1,
+ IMAGE_REL_AMD64_REL32_2,
+ IMAGE_REL_AMD64_REL32_3,
+ IMAGE_REL_AMD64_REL32_4,
+ IMAGE_REL_AMD64_REL32_5,
+ IMAGE_REL_AMD64_SECTION,
+ IMAGE_REL_AMD64_SECREL,
+ IMAGE_REL_AMD64_SECREL7,
+ IMAGE_REL_AMD64_TOKEN,
+ IMAGE_REL_AMD64_SREL32,
+ IMAGE_REL_AMD64_PAIR,
+ IMAGE_REL_AMD64_SSPAN32,
+};
+
+enum arm_coff_reloc_type {
+ IMAGE_REL_ARM_ABSOLUTE,
+ IMAGE_REL_ARM_ADDR32,
+ IMAGE_REL_ARM_ADDR32N,
+ IMAGE_REL_ARM_BRANCH2,
+ IMAGE_REL_ARM_BRANCH1,
+ IMAGE_REL_ARM_SECTION,
+ IMAGE_REL_ARM_SECREL,
+};
+
+enum sh_coff_reloc_type {
+ IMAGE_REL_SH3_ABSOLUTE,
+ IMAGE_REL_SH3_DIRECT16,
+ IMAGE_REL_SH3_DIRECT32,
+ IMAGE_REL_SH3_DIRECT8,
+ IMAGE_REL_SH3_DIRECT8_WORD,
+ IMAGE_REL_SH3_DIRECT8_LONG,
+ IMAGE_REL_SH3_DIRECT4,
+ IMAGE_REL_SH3_DIRECT4_WORD,
+ IMAGE_REL_SH3_DIRECT4_LONG,
+ IMAGE_REL_SH3_PCREL8_WORD,
+ IMAGE_REL_SH3_PCREL8_LONG,
+ IMAGE_REL_SH3_PCREL12_WORD,
+ IMAGE_REL_SH3_STARTOF_SECTION,
+ IMAGE_REL_SH3_SIZEOF_SECTION,
+ IMAGE_REL_SH3_SECTION,
+ IMAGE_REL_SH3_SECREL,
+ IMAGE_REL_SH3_DIRECT32_NB,
+ IMAGE_REL_SH3_GPREL4_LONG,
+ IMAGE_REL_SH3_TOKEN,
+ IMAGE_REL_SHM_PCRELPT,
+ IMAGE_REL_SHM_REFLO,
+ IMAGE_REL_SHM_REFHALF,
+ IMAGE_REL_SHM_RELLO,
+ IMAGE_REL_SHM_RELHALF,
+ IMAGE_REL_SHM_PAIR,
+ IMAGE_REL_SHM_NOMODE,
+};
+
+enum ppc_coff_reloc_type {
+ IMAGE_REL_PPC_ABSOLUTE,
+ IMAGE_REL_PPC_ADDR64,
+ IMAGE_REL_PPC_ADDR32,
+ IMAGE_REL_PPC_ADDR24,
+ IMAGE_REL_PPC_ADDR16,
+ IMAGE_REL_PPC_ADDR14,
+ IMAGE_REL_PPC_REL24,
+ IMAGE_REL_PPC_REL14,
+ IMAGE_REL_PPC_ADDR32N,
+ IMAGE_REL_PPC_SECREL,
+ IMAGE_REL_PPC_SECTION,
+ IMAGE_REL_PPC_SECREL16,
+ IMAGE_REL_PPC_REFHI,
+ IMAGE_REL_PPC_REFLO,
+ IMAGE_REL_PPC_PAIR,
+ IMAGE_REL_PPC_SECRELLO,
+ IMAGE_REL_PPC_GPREL,
+ IMAGE_REL_PPC_TOKEN,
+};
+
+enum x86_coff_reloc_type {
+ IMAGE_REL_I386_ABSOLUTE,
+ IMAGE_REL_I386_DIR16,
+ IMAGE_REL_I386_REL16,
+ IMAGE_REL_I386_DIR32,
+ IMAGE_REL_I386_DIR32NB,
+ IMAGE_REL_I386_SEG12,
+ IMAGE_REL_I386_SECTION,
+ IMAGE_REL_I386_SECREL,
+ IMAGE_REL_I386_TOKEN,
+ IMAGE_REL_I386_SECREL7,
+ IMAGE_REL_I386_REL32,
+};
+
+enum ia64_coff_reloc_type {
+ IMAGE_REL_IA64_ABSOLUTE,
+ IMAGE_REL_IA64_IMM14,
+ IMAGE_REL_IA64_IMM22,
+ IMAGE_REL_IA64_IMM64,
+ IMAGE_REL_IA64_DIR32,
+ IMAGE_REL_IA64_DIR64,
+ IMAGE_REL_IA64_PCREL21B,
+ IMAGE_REL_IA64_PCREL21M,
+ IMAGE_REL_IA64_PCREL21F,
+ IMAGE_REL_IA64_GPREL22,
+ IMAGE_REL_IA64_LTOFF22,
+ IMAGE_REL_IA64_SECTION,
+ IMAGE_REL_IA64_SECREL22,
+ IMAGE_REL_IA64_SECREL64I,
+ IMAGE_REL_IA64_SECREL32,
+ IMAGE_REL_IA64_DIR32NB,
+ IMAGE_REL_IA64_SREL14,
+ IMAGE_REL_IA64_SREL22,
+ IMAGE_REL_IA64_SREL32,
+ IMAGE_REL_IA64_UREL32,
+ IMAGE_REL_IA64_PCREL60X,
+ IMAGE_REL_IA64_PCREL60B,
+ IMAGE_REL_IA64_PCREL60F,
+ IMAGE_REL_IA64_PCREL60I,
+ IMAGE_REL_IA64_PCREL60M,
+ IMAGE_REL_IA64_IMMGPREL6,
+ IMAGE_REL_IA64_TOKEN,
+ IMAGE_REL_IA64_GPREL32,
+ IMAGE_REL_IA64_ADDEND,
+};
+
+struct coff_reloc {
+ uint32_t virtual_address;
+ uint32_t symbol_table_index;
+ union {
+ enum x64_coff_reloc_type x64_type;
+ enum arm_coff_reloc_type arm_type;
+ enum sh_coff_reloc_type sh_type;
+ enum ppc_coff_reloc_type ppc_type;
+ enum x86_coff_reloc_type x86_type;
+ enum ia64_coff_reloc_type ia64_type;
+ uint16_t data;
+ };
+};
+
+/*
+ * Definitions for the contents of the certs data block
+ */
+#define WIN_CERT_TYPE_PKCS_SIGNED_DATA 0x0002
+#define WIN_CERT_TYPE_EFI_OKCS115 0x0EF0
+#define WIN_CERT_TYPE_EFI_GUID 0x0EF1
+
+#define WIN_CERT_REVISION_1_0 0x0100
+#define WIN_CERT_REVISION_2_0 0x0200
+
+struct win_certificate {
+ uint32_t length;
+ uint16_t revision;
+ uint16_t cert_type;
+};
+
+#endif /* __LINUX_PE_H */
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 2/9] Provide PE binary definitions
2014-07-03 21:07 ` [PATCH 2/9] Provide PE binary definitions Vivek Goyal
@ 2014-07-04 19:12 ` Anca Emanuel
2014-07-04 19:14 ` H. Peter Anvin
2014-07-04 19:16 ` Matthew Garrett
0 siblings, 2 replies; 18+ messages in thread
From: Anca Emanuel @ 2014-07-04 19:12 UTC (permalink / raw)
To: Vivek Goyal
Cc: LKML, Eric W . Biederman, H. Peter Anvin, mjg59,
Greg Kroah-Hartman, Borislav Petkov, dyoung, chaowang, bhe,
Andrew Morton, dhowells, pjones
Wow MZ ? EXE for MSDOS and Windows ???
After more research, http://en.wikipedia.org/wiki/Portable_Executable
[quote]PE is a modified version of the Unix COFF (Common Object File
Format).[/quote]
How can anyone be sure that Microsoft will not sue about this ?
On Fri, Jul 4, 2014 at 12:07 AM, Vivek Goyal <vgoyal@redhat.com> wrote:
> Provide some PE binary structural and constant definitions as taken from the
> pesign package sources.
>
> Signed-off-by: David Howells <dhowells@redhat.com>
> Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
> ---
> include/linux/pe.h | 448 +++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 448 insertions(+)
> create mode 100644 include/linux/pe.h
>
> diff --git a/include/linux/pe.h b/include/linux/pe.h
> new file mode 100644
> index 0000000..e170b95
> --- /dev/null
> +++ b/include/linux/pe.h
> @@ -0,0 +1,448 @@
> +/*
> + * Copyright 2011 Red Hat, Inc.
> + * All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 2 of the License.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
> + *
> + * Author(s): Peter Jones <pjones@redhat.com>
> + */
> +#ifndef __LINUX_PE_H
> +#define __LINUX_PE_H
> +
> +#include <linux/types.h>
> +
> +#define MZ_MAGIC 0x5a4d /* "MZ" */
> +
> +struct mz_hdr {
> + uint16_t magic; /* MZ_MAGIC */
> + uint16_t lbsize; /* size of last used block */
> + uint16_t blocks; /* pages in file, 0x3 */
> + uint16_t relocs; /* relocations */
> + uint16_t hdrsize; /* header size in "paragraphs" */
> + uint16_t min_extra_pps; /* .bss */
> + uint16_t max_extra_pps; /* runtime limit for the arena size */
> + uint16_t ss; /* relative stack segment */
> + uint16_t sp; /* initial %sp register */
> + uint16_t checksum; /* word checksum */
> + uint16_t ip; /* initial %ip register */
> + uint16_t cs; /* initial %cs relative to load segment */
> + uint16_t reloc_table_offset; /* offset of the first relocation */
> + uint16_t overlay_num; /* overlay number. set to 0. */
> + uint16_t reserved0[4]; /* reserved */
> + uint16_t oem_id; /* oem identifier */
> + uint16_t oem_info; /* oem specific */
> + uint16_t reserved1[10]; /* reserved */
> + uint32_t peaddr; /* address of pe header */
> + char message[64]; /* message to print */
> +};
> +
> +struct mz_reloc {
> + uint16_t offset;
> + uint16_t segment;
> +};
> +
> +#define PE_MAGIC 0x00004550 /* "PE\0\0" */
> +#define PE_OPT_MAGIC_PE32 0x010b
> +#define PE_OPT_MAGIC_PE32_ROM 0x0107
> +#define PE_OPT_MAGIC_PE32PLUS 0x020b
> +
> +/* machine type */
> +#define IMAGE_FILE_MACHINE_UNKNOWN 0x0000
> +#define IMAGE_FILE_MACHINE_AM33 0x01d3
> +#define IMAGE_FILE_MACHINE_AMD64 0x8664
> +#define IMAGE_FILE_MACHINE_ARM 0x01c0
> +#define IMAGE_FILE_MACHINE_ARMV7 0x01c4
> +#define IMAGE_FILE_MACHINE_EBC 0x0ebc
> +#define IMAGE_FILE_MACHINE_I386 0x014c
> +#define IMAGE_FILE_MACHINE_IA64 0x0200
> +#define IMAGE_FILE_MACHINE_M32R 0x9041
> +#define IMAGE_FILE_MACHINE_MIPS16 0x0266
> +#define IMAGE_FILE_MACHINE_MIPSFPU 0x0366
> +#define IMAGE_FILE_MACHINE_MIPSFPU16 0x0466
> +#define IMAGE_FILE_MACHINE_POWERPC 0x01f0
> +#define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1
> +#define IMAGE_FILE_MACHINE_R4000 0x0166
> +#define IMAGE_FILE_MACHINE_SH3 0x01a2
> +#define IMAGE_FILE_MACHINE_SH3DSP 0x01a3
> +#define IMAGE_FILE_MACHINE_SH3E 0x01a4
> +#define IMAGE_FILE_MACHINE_SH4 0x01a6
> +#define IMAGE_FILE_MACHINE_SH5 0x01a8
> +#define IMAGE_FILE_MACHINE_THUMB 0x01c2
> +#define IMAGE_FILE_MACHINE_WCEMIPSV2 0x0169
> +
> +/* flags */
> +#define IMAGE_FILE_RELOCS_STRIPPED 0x0001
> +#define IMAGE_FILE_EXECUTABLE_IMAGE 0x0002
> +#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004
> +#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008
> +#define IMAGE_FILE_AGGRESSIVE_WS_TRIM 0x0010
> +#define IMAGE_FILE_LARGE_ADDRESS_AWARE 0x0020
> +#define IMAGE_FILE_16BIT_MACHINE 0x0040
> +#define IMAGE_FILE_BYTES_REVERSED_LO 0x0080
> +#define IMAGE_FILE_32BIT_MACHINE 0x0100
> +#define IMAGE_FILE_DEBUG_STRIPPED 0x0200
> +#define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP 0x0400
> +#define IMAGE_FILE_NET_RUN_FROM_SWAP 0x0800
> +#define IMAGE_FILE_SYSTEM 0x1000
> +#define IMAGE_FILE_DLL 0x2000
> +#define IMAGE_FILE_UP_SYSTEM_ONLY 0x4000
> +#define IMAGE_FILE_BYTES_REVERSED_HI 0x8000
> +
> +struct pe_hdr {
> + uint32_t magic; /* PE magic */
> + uint16_t machine; /* machine type */
> + uint16_t sections; /* number of sections */
> + uint32_t timestamp; /* time_t */
> + uint32_t symbol_table; /* symbol table offset */
> + uint32_t symbols; /* number of symbols */
> + uint16_t opt_hdr_size; /* size of optional header */
> + uint16_t flags; /* flags */
> +};
> +
> +#define IMAGE_FILE_OPT_ROM_MAGIC 0x107
> +#define IMAGE_FILE_OPT_PE32_MAGIC 0x10b
> +#define IMAGE_FILE_OPT_PE32_PLUS_MAGIC 0x20b
> +
> +#define IMAGE_SUBSYSTEM_UNKNOWN 0
> +#define IMAGE_SUBSYSTEM_NATIVE 1
> +#define IMAGE_SUBSYSTEM_WINDOWS_GUI 2
> +#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3
> +#define IMAGE_SUBSYSTEM_POSIX_CUI 7
> +#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI 9
> +#define IMAGE_SUBSYSTEM_EFI_APPLICATION 10
> +#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11
> +#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12
> +#define IMAGE_SUBSYSTEM_EFI_ROM_IMAGE 13
> +#define IMAGE_SUBSYSTEM_XBOX 14
> +
> +#define IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE 0x0040
> +#define IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY 0x0080
> +#define IMAGE_DLL_CHARACTERISTICS_NX_COMPAT 0x0100
> +#define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200
> +#define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400
> +#define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800
> +#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER 0x2000
> +#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000
> +
> +/* the fact that pe32 isn't padded where pe32+ is 64-bit means union won't
> + * work right. vomit. */
> +struct pe32_opt_hdr {
> + /* "standard" header */
> + uint16_t magic; /* file type */
> + uint8_t ld_major; /* linker major version */
> + uint8_t ld_minor; /* linker minor version */
> + uint32_t text_size; /* size of text section(s) */
> + uint32_t data_size; /* size of data section(s) */
> + uint32_t bss_size; /* size of bss section(s) */
> + uint32_t entry_point; /* file offset of entry point */
> + uint32_t code_base; /* relative code addr in ram */
> + uint32_t data_base; /* relative data addr in ram */
> + /* "windows" header */
> + uint32_t image_base; /* preferred load address */
> + uint32_t section_align; /* alignment in bytes */
> + uint32_t file_align; /* file alignment in bytes */
> + uint16_t os_major; /* major OS version */
> + uint16_t os_minor; /* minor OS version */
> + uint16_t image_major; /* major image version */
> + uint16_t image_minor; /* minor image version */
> + uint16_t subsys_major; /* major subsystem version */
> + uint16_t subsys_minor; /* minor subsystem version */
> + uint32_t win32_version; /* reserved, must be 0 */
> + uint32_t image_size; /* image size */
> + uint32_t header_size; /* header size rounded up to
> + file_align */
> + uint32_t csum; /* checksum */
> + uint16_t subsys; /* subsystem */
> + uint16_t dll_flags; /* more flags! */
> + uint32_t stack_size_req;/* amt of stack requested */
> + uint32_t stack_size; /* amt of stack required */
> + uint32_t heap_size_req; /* amt of heap requested */
> + uint32_t heap_size; /* amt of heap required */
> + uint32_t loader_flags; /* reserved, must be 0 */
> + uint32_t data_dirs; /* number of data dir entries */
> +};
> +
> +struct pe32plus_opt_hdr {
> + uint16_t magic; /* file type */
> + uint8_t ld_major; /* linker major version */
> + uint8_t ld_minor; /* linker minor version */
> + uint32_t text_size; /* size of text section(s) */
> + uint32_t data_size; /* size of data section(s) */
> + uint32_t bss_size; /* size of bss section(s) */
> + uint32_t entry_point; /* file offset of entry point */
> + uint32_t code_base; /* relative code addr in ram */
> + /* "windows" header */
> + uint64_t image_base; /* preferred load address */
> + uint32_t section_align; /* alignment in bytes */
> + uint32_t file_align; /* file alignment in bytes */
> + uint16_t os_major; /* major OS version */
> + uint16_t os_minor; /* minor OS version */
> + uint16_t image_major; /* major image version */
> + uint16_t image_minor; /* minor image version */
> + uint16_t subsys_major; /* major subsystem version */
> + uint16_t subsys_minor; /* minor subsystem version */
> + uint32_t win32_version; /* reserved, must be 0 */
> + uint32_t image_size; /* image size */
> + uint32_t header_size; /* header size rounded up to
> + file_align */
> + uint32_t csum; /* checksum */
> + uint16_t subsys; /* subsystem */
> + uint16_t dll_flags; /* more flags! */
> + uint64_t stack_size_req;/* amt of stack requested */
> + uint64_t stack_size; /* amt of stack required */
> + uint64_t heap_size_req; /* amt of heap requested */
> + uint64_t heap_size; /* amt of heap required */
> + uint32_t loader_flags; /* reserved, must be 0 */
> + uint32_t data_dirs; /* number of data dir entries */
> +};
> +
> +struct data_dirent {
> + uint32_t virtual_address; /* relative to load address */
> + uint32_t size;
> +};
> +
> +struct data_directory {
> + struct data_dirent exports; /* .edata */
> + struct data_dirent imports; /* .idata */
> + struct data_dirent resources; /* .rsrc */
> + struct data_dirent exceptions; /* .pdata */
> + struct data_dirent certs; /* certs */
> + struct data_dirent base_relocations; /* .reloc */
> + struct data_dirent debug; /* .debug */
> + struct data_dirent arch; /* reservered */
> + struct data_dirent global_ptr; /* global pointer reg. Size=0 */
> + struct data_dirent tls; /* .tls */
> + struct data_dirent load_config; /* load configuration structure */
> + struct data_dirent bound_imports; /* no idea */
> + struct data_dirent import_addrs; /* import address table */
> + struct data_dirent delay_imports; /* delay-load import table */
> + struct data_dirent clr_runtime_hdr; /* .cor (object only) */
> + struct data_dirent reserved;
> +};
> +
> +struct section_header {
> + char name[8]; /* name or "/12\0" string tbl offset */
> + uint32_t virtual_size; /* size of loaded section in ram */
> + uint32_t virtual_address; /* relative virtual address */
> + uint32_t raw_data_size; /* size of the section */
> + uint32_t data_addr; /* file pointer to first page of sec */
> + uint32_t relocs; /* file pointer to relocation entries */
> + uint32_t line_numbers; /* line numbers! */
> + uint16_t num_relocs; /* number of relocations */
> + uint16_t num_lin_numbers; /* srsly. */
> + uint32_t flags;
> +};
> +
> +/* they actually defined 0x00000000 as well, but I think we'll skip that one. */
> +#define IMAGE_SCN_RESERVED_0 0x00000001
> +#define IMAGE_SCN_RESERVED_1 0x00000002
> +#define IMAGE_SCN_RESERVED_2 0x00000004
> +#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 /* don't pad - obsolete */
> +#define IMAGE_SCN_RESERVED_3 0x00000010
> +#define IMAGE_SCN_CNT_CODE 0x00000020 /* .text */
> +#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 /* .data */
> +#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 /* .bss */
> +#define IMAGE_SCN_LNK_OTHER 0x00000100 /* reserved */
> +#define IMAGE_SCN_LNK_INFO 0x00000200 /* .drectve comments */
> +#define IMAGE_SCN_RESERVED_4 0x00000400
> +#define IMAGE_SCN_LNK_REMOVE 0x00000800 /* .o only - scn to be rm'd*/
> +#define IMAGE_SCN_LNK_COMDAT 0x00001000 /* .o only - COMDAT data */
> +#define IMAGE_SCN_RESERVED_5 0x00002000 /* spec omits this */
> +#define IMAGE_SCN_RESERVED_6 0x00004000 /* spec omits this */
> +#define IMAGE_SCN_GPREL 0x00008000 /* global pointer referenced data */
> +/* spec lists 0x20000 twice, I suspect they meant 0x10000 for one of them */
> +#define IMAGE_SCN_MEM_PURGEABLE 0x00010000 /* reserved for "future" use */
> +#define IMAGE_SCN_16BIT 0x00020000 /* reserved for "future" use */
> +#define IMAGE_SCN_LOCKED 0x00040000 /* reserved for "future" use */
> +#define IMAGE_SCN_PRELOAD 0x00080000 /* reserved for "future" use */
> +/* and here they just stuck a 1-byte integer in the middle of a bitfield */
> +#define IMAGE_SCN_ALIGN_1BYTES 0x00100000 /* it does what it says on the box */
> +#define IMAGE_SCN_ALIGN_2BYTES 0x00200000
> +#define IMAGE_SCN_ALIGN_4BYTES 0x00300000
> +#define IMAGE_SCN_ALIGN_8BYTES 0x00400000
> +#define IMAGE_SCN_ALIGN_16BYTES 0x00500000
> +#define IMAGE_SCN_ALIGN_32BYTES 0x00600000
> +#define IMAGE_SCN_ALIGN_64BYTES 0x00700000
> +#define IMAGE_SCN_ALIGN_128BYTES 0x00800000
> +#define IMAGE_SCN_ALIGN_256BYTES 0x00900000
> +#define IMAGE_SCN_ALIGN_512BYTES 0x00a00000
> +#define IMAGE_SCN_ALIGN_1024BYTES 0x00b00000
> +#define IMAGE_SCN_ALIGN_2048BYTES 0x00c00000
> +#define IMAGE_SCN_ALIGN_4096BYTES 0x00d00000
> +#define IMAGE_SCN_ALIGN_8192BYTES 0x00e00000
> +#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 /* extended relocations */
> +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 /* scn can be discarded */
> +#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 /* cannot be cached */
> +#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 /* not pageable */
> +#define IMAGE_SCN_MEM_SHARED 0x10000000 /* can be shared */
> +#define IMAGE_SCN_MEM_EXECUTE 0x20000000 /* can be executed as code */
> +#define IMAGE_SCN_MEM_READ 0x40000000 /* readable */
> +#define IMAGE_SCN_MEM_WRITE 0x80000000 /* writeable */
> +
> +enum x64_coff_reloc_type {
> + IMAGE_REL_AMD64_ABSOLUTE = 0,
> + IMAGE_REL_AMD64_ADDR64,
> + IMAGE_REL_AMD64_ADDR32,
> + IMAGE_REL_AMD64_ADDR32N,
> + IMAGE_REL_AMD64_REL32,
> + IMAGE_REL_AMD64_REL32_1,
> + IMAGE_REL_AMD64_REL32_2,
> + IMAGE_REL_AMD64_REL32_3,
> + IMAGE_REL_AMD64_REL32_4,
> + IMAGE_REL_AMD64_REL32_5,
> + IMAGE_REL_AMD64_SECTION,
> + IMAGE_REL_AMD64_SECREL,
> + IMAGE_REL_AMD64_SECREL7,
> + IMAGE_REL_AMD64_TOKEN,
> + IMAGE_REL_AMD64_SREL32,
> + IMAGE_REL_AMD64_PAIR,
> + IMAGE_REL_AMD64_SSPAN32,
> +};
> +
> +enum arm_coff_reloc_type {
> + IMAGE_REL_ARM_ABSOLUTE,
> + IMAGE_REL_ARM_ADDR32,
> + IMAGE_REL_ARM_ADDR32N,
> + IMAGE_REL_ARM_BRANCH2,
> + IMAGE_REL_ARM_BRANCH1,
> + IMAGE_REL_ARM_SECTION,
> + IMAGE_REL_ARM_SECREL,
> +};
> +
> +enum sh_coff_reloc_type {
> + IMAGE_REL_SH3_ABSOLUTE,
> + IMAGE_REL_SH3_DIRECT16,
> + IMAGE_REL_SH3_DIRECT32,
> + IMAGE_REL_SH3_DIRECT8,
> + IMAGE_REL_SH3_DIRECT8_WORD,
> + IMAGE_REL_SH3_DIRECT8_LONG,
> + IMAGE_REL_SH3_DIRECT4,
> + IMAGE_REL_SH3_DIRECT4_WORD,
> + IMAGE_REL_SH3_DIRECT4_LONG,
> + IMAGE_REL_SH3_PCREL8_WORD,
> + IMAGE_REL_SH3_PCREL8_LONG,
> + IMAGE_REL_SH3_PCREL12_WORD,
> + IMAGE_REL_SH3_STARTOF_SECTION,
> + IMAGE_REL_SH3_SIZEOF_SECTION,
> + IMAGE_REL_SH3_SECTION,
> + IMAGE_REL_SH3_SECREL,
> + IMAGE_REL_SH3_DIRECT32_NB,
> + IMAGE_REL_SH3_GPREL4_LONG,
> + IMAGE_REL_SH3_TOKEN,
> + IMAGE_REL_SHM_PCRELPT,
> + IMAGE_REL_SHM_REFLO,
> + IMAGE_REL_SHM_REFHALF,
> + IMAGE_REL_SHM_RELLO,
> + IMAGE_REL_SHM_RELHALF,
> + IMAGE_REL_SHM_PAIR,
> + IMAGE_REL_SHM_NOMODE,
> +};
> +
> +enum ppc_coff_reloc_type {
> + IMAGE_REL_PPC_ABSOLUTE,
> + IMAGE_REL_PPC_ADDR64,
> + IMAGE_REL_PPC_ADDR32,
> + IMAGE_REL_PPC_ADDR24,
> + IMAGE_REL_PPC_ADDR16,
> + IMAGE_REL_PPC_ADDR14,
> + IMAGE_REL_PPC_REL24,
> + IMAGE_REL_PPC_REL14,
> + IMAGE_REL_PPC_ADDR32N,
> + IMAGE_REL_PPC_SECREL,
> + IMAGE_REL_PPC_SECTION,
> + IMAGE_REL_PPC_SECREL16,
> + IMAGE_REL_PPC_REFHI,
> + IMAGE_REL_PPC_REFLO,
> + IMAGE_REL_PPC_PAIR,
> + IMAGE_REL_PPC_SECRELLO,
> + IMAGE_REL_PPC_GPREL,
> + IMAGE_REL_PPC_TOKEN,
> +};
> +
> +enum x86_coff_reloc_type {
> + IMAGE_REL_I386_ABSOLUTE,
> + IMAGE_REL_I386_DIR16,
> + IMAGE_REL_I386_REL16,
> + IMAGE_REL_I386_DIR32,
> + IMAGE_REL_I386_DIR32NB,
> + IMAGE_REL_I386_SEG12,
> + IMAGE_REL_I386_SECTION,
> + IMAGE_REL_I386_SECREL,
> + IMAGE_REL_I386_TOKEN,
> + IMAGE_REL_I386_SECREL7,
> + IMAGE_REL_I386_REL32,
> +};
> +
> +enum ia64_coff_reloc_type {
> + IMAGE_REL_IA64_ABSOLUTE,
> + IMAGE_REL_IA64_IMM14,
> + IMAGE_REL_IA64_IMM22,
> + IMAGE_REL_IA64_IMM64,
> + IMAGE_REL_IA64_DIR32,
> + IMAGE_REL_IA64_DIR64,
> + IMAGE_REL_IA64_PCREL21B,
> + IMAGE_REL_IA64_PCREL21M,
> + IMAGE_REL_IA64_PCREL21F,
> + IMAGE_REL_IA64_GPREL22,
> + IMAGE_REL_IA64_LTOFF22,
> + IMAGE_REL_IA64_SECTION,
> + IMAGE_REL_IA64_SECREL22,
> + IMAGE_REL_IA64_SECREL64I,
> + IMAGE_REL_IA64_SECREL32,
> + IMAGE_REL_IA64_DIR32NB,
> + IMAGE_REL_IA64_SREL14,
> + IMAGE_REL_IA64_SREL22,
> + IMAGE_REL_IA64_SREL32,
> + IMAGE_REL_IA64_UREL32,
> + IMAGE_REL_IA64_PCREL60X,
> + IMAGE_REL_IA64_PCREL60B,
> + IMAGE_REL_IA64_PCREL60F,
> + IMAGE_REL_IA64_PCREL60I,
> + IMAGE_REL_IA64_PCREL60M,
> + IMAGE_REL_IA64_IMMGPREL6,
> + IMAGE_REL_IA64_TOKEN,
> + IMAGE_REL_IA64_GPREL32,
> + IMAGE_REL_IA64_ADDEND,
> +};
> +
> +struct coff_reloc {
> + uint32_t virtual_address;
> + uint32_t symbol_table_index;
> + union {
> + enum x64_coff_reloc_type x64_type;
> + enum arm_coff_reloc_type arm_type;
> + enum sh_coff_reloc_type sh_type;
> + enum ppc_coff_reloc_type ppc_type;
> + enum x86_coff_reloc_type x86_type;
> + enum ia64_coff_reloc_type ia64_type;
> + uint16_t data;
> + };
> +};
> +
> +/*
> + * Definitions for the contents of the certs data block
> + */
> +#define WIN_CERT_TYPE_PKCS_SIGNED_DATA 0x0002
> +#define WIN_CERT_TYPE_EFI_OKCS115 0x0EF0
> +#define WIN_CERT_TYPE_EFI_GUID 0x0EF1
> +
> +#define WIN_CERT_REVISION_1_0 0x0100
> +#define WIN_CERT_REVISION_2_0 0x0200
> +
> +struct win_certificate {
> + uint32_t length;
> + uint16_t revision;
> + uint16_t cert_type;
> +};
> +
> +#endif /* __LINUX_PE_H */
> --
> 1.9.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 2/9] Provide PE binary definitions
2014-07-04 19:12 ` Anca Emanuel
@ 2014-07-04 19:14 ` H. Peter Anvin
2014-07-04 19:16 ` Matthew Garrett
1 sibling, 0 replies; 18+ messages in thread
From: H. Peter Anvin @ 2014-07-04 19:14 UTC (permalink / raw)
To: Anca Emanuel, Vivek Goyal
Cc: LKML, Eric W . Biederman, mjg59, Greg Kroah-Hartman,
Borislav Petkov, dyoung, chaowang, bhe, Andrew Morton, dhowells,
pjones
Because it is an established part of the UEFI specification which has specific terms for adoption.
On July 4, 2014 12:12:51 PM PDT, Anca Emanuel <anca.emanuel@gmail.com> wrote:
>Wow MZ ? EXE for MSDOS and Windows ???
>
>After more research, http://en.wikipedia.org/wiki/Portable_Executable
>[quote]PE is a modified version of the Unix COFF (Common Object File
>Format).[/quote]
>
>How can anyone be sure that Microsoft will not sue about this ?
>
>On Fri, Jul 4, 2014 at 12:07 AM, Vivek Goyal <vgoyal@redhat.com> wrote:
>> Provide some PE binary structural and constant definitions as taken
>from the
>> pesign package sources.
>>
>> Signed-off-by: David Howells <dhowells@redhat.com>
>> Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
>> ---
>> include/linux/pe.h | 448
>+++++++++++++++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 448 insertions(+)
>> create mode 100644 include/linux/pe.h
>>
>> diff --git a/include/linux/pe.h b/include/linux/pe.h
>> new file mode 100644
>> index 0000000..e170b95
>> --- /dev/null
>> +++ b/include/linux/pe.h
>> @@ -0,0 +1,448 @@
>> +/*
>> + * Copyright 2011 Red Hat, Inc.
>> + * All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or
>modify
>> + * it under the terms of the GNU General Public License as published
>by
>> + * the Free Software Foundation; version 2 of the License.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program. If not, see
><http://www.gnu.org/licenses/>.
>> + *
>> + * Author(s): Peter Jones <pjones@redhat.com>
>> + */
>> +#ifndef __LINUX_PE_H
>> +#define __LINUX_PE_H
>> +
>> +#include <linux/types.h>
>> +
>> +#define MZ_MAGIC 0x5a4d /* "MZ" */
>> +
>> +struct mz_hdr {
>> + uint16_t magic; /* MZ_MAGIC */
>> + uint16_t lbsize; /* size of last used block */
>> + uint16_t blocks; /* pages in file, 0x3 */
>> + uint16_t relocs; /* relocations */
>> + uint16_t hdrsize; /* header size in "paragraphs" */
>> + uint16_t min_extra_pps; /* .bss */
>> + uint16_t max_extra_pps; /* runtime limit for the arena size
>*/
>> + uint16_t ss; /* relative stack segment */
>> + uint16_t sp; /* initial %sp register */
>> + uint16_t checksum; /* word checksum */
>> + uint16_t ip; /* initial %ip register */
>> + uint16_t cs; /* initial %cs relative to load
>segment */
>> + uint16_t reloc_table_offset; /* offset of the first
>relocation */
>> + uint16_t overlay_num; /* overlay number. set to 0. */
>> + uint16_t reserved0[4]; /* reserved */
>> + uint16_t oem_id; /* oem identifier */
>> + uint16_t oem_info; /* oem specific */
>> + uint16_t reserved1[10]; /* reserved */
>> + uint32_t peaddr; /* address of pe header */
>> + char message[64]; /* message to print */
>> +};
>> +
>> +struct mz_reloc {
>> + uint16_t offset;
>> + uint16_t segment;
>> +};
>> +
>> +#define PE_MAGIC 0x00004550 /* "PE\0\0" */
>> +#define PE_OPT_MAGIC_PE32 0x010b
>> +#define PE_OPT_MAGIC_PE32_ROM 0x0107
>> +#define PE_OPT_MAGIC_PE32PLUS 0x020b
>> +
>> +/* machine type */
>> +#define IMAGE_FILE_MACHINE_UNKNOWN 0x0000
>> +#define IMAGE_FILE_MACHINE_AM33 0x01d3
>> +#define IMAGE_FILE_MACHINE_AMD64 0x8664
>> +#define IMAGE_FILE_MACHINE_ARM 0x01c0
>> +#define IMAGE_FILE_MACHINE_ARMV7 0x01c4
>> +#define IMAGE_FILE_MACHINE_EBC 0x0ebc
>> +#define IMAGE_FILE_MACHINE_I386 0x014c
>> +#define IMAGE_FILE_MACHINE_IA64 0x0200
>> +#define IMAGE_FILE_MACHINE_M32R 0x9041
>> +#define IMAGE_FILE_MACHINE_MIPS16 0x0266
>> +#define IMAGE_FILE_MACHINE_MIPSFPU 0x0366
>> +#define IMAGE_FILE_MACHINE_MIPSFPU16 0x0466
>> +#define IMAGE_FILE_MACHINE_POWERPC 0x01f0
>> +#define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1
>> +#define IMAGE_FILE_MACHINE_R4000 0x0166
>> +#define IMAGE_FILE_MACHINE_SH3 0x01a2
>> +#define IMAGE_FILE_MACHINE_SH3DSP 0x01a3
>> +#define IMAGE_FILE_MACHINE_SH3E 0x01a4
>> +#define IMAGE_FILE_MACHINE_SH4 0x01a6
>> +#define IMAGE_FILE_MACHINE_SH5 0x01a8
>> +#define IMAGE_FILE_MACHINE_THUMB 0x01c2
>> +#define IMAGE_FILE_MACHINE_WCEMIPSV2 0x0169
>> +
>> +/* flags */
>> +#define IMAGE_FILE_RELOCS_STRIPPED 0x0001
>> +#define IMAGE_FILE_EXECUTABLE_IMAGE 0x0002
>> +#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004
>> +#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008
>> +#define IMAGE_FILE_AGGRESSIVE_WS_TRIM 0x0010
>> +#define IMAGE_FILE_LARGE_ADDRESS_AWARE 0x0020
>> +#define IMAGE_FILE_16BIT_MACHINE 0x0040
>> +#define IMAGE_FILE_BYTES_REVERSED_LO 0x0080
>> +#define IMAGE_FILE_32BIT_MACHINE 0x0100
>> +#define IMAGE_FILE_DEBUG_STRIPPED 0x0200
>> +#define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP 0x0400
>> +#define IMAGE_FILE_NET_RUN_FROM_SWAP 0x0800
>> +#define IMAGE_FILE_SYSTEM 0x1000
>> +#define IMAGE_FILE_DLL 0x2000
>> +#define IMAGE_FILE_UP_SYSTEM_ONLY 0x4000
>> +#define IMAGE_FILE_BYTES_REVERSED_HI 0x8000
>> +
>> +struct pe_hdr {
>> + uint32_t magic; /* PE magic */
>> + uint16_t machine; /* machine type */
>> + uint16_t sections; /* number of sections */
>> + uint32_t timestamp; /* time_t */
>> + uint32_t symbol_table; /* symbol table offset */
>> + uint32_t symbols; /* number of symbols */
>> + uint16_t opt_hdr_size; /* size of optional header */
>> + uint16_t flags; /* flags */
>> +};
>> +
>> +#define IMAGE_FILE_OPT_ROM_MAGIC 0x107
>> +#define IMAGE_FILE_OPT_PE32_MAGIC 0x10b
>> +#define IMAGE_FILE_OPT_PE32_PLUS_MAGIC 0x20b
>> +
>> +#define IMAGE_SUBSYSTEM_UNKNOWN 0
>> +#define IMAGE_SUBSYSTEM_NATIVE 1
>> +#define IMAGE_SUBSYSTEM_WINDOWS_GUI 2
>> +#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3
>> +#define IMAGE_SUBSYSTEM_POSIX_CUI 7
>> +#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI 9
>> +#define IMAGE_SUBSYSTEM_EFI_APPLICATION 10
>> +#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11
>> +#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12
>> +#define IMAGE_SUBSYSTEM_EFI_ROM_IMAGE 13
>> +#define IMAGE_SUBSYSTEM_XBOX 14
>> +
>> +#define IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE 0x0040
>> +#define IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY 0x0080
>> +#define IMAGE_DLL_CHARACTERISTICS_NX_COMPAT 0x0100
>> +#define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200
>> +#define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400
>> +#define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800
>> +#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER 0x2000
>> +#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000
>> +
>> +/* the fact that pe32 isn't padded where pe32+ is 64-bit means union
>won't
>> + * work right. vomit. */
>> +struct pe32_opt_hdr {
>> + /* "standard" header */
>> + uint16_t magic; /* file type */
>> + uint8_t ld_major; /* linker major version */
>> + uint8_t ld_minor; /* linker minor version */
>> + uint32_t text_size; /* size of text section(s) */
>> + uint32_t data_size; /* size of data section(s) */
>> + uint32_t bss_size; /* size of bss section(s) */
>> + uint32_t entry_point; /* file offset of entry point */
>> + uint32_t code_base; /* relative code addr in ram */
>> + uint32_t data_base; /* relative data addr in ram */
>> + /* "windows" header */
>> + uint32_t image_base; /* preferred load address */
>> + uint32_t section_align; /* alignment in bytes */
>> + uint32_t file_align; /* file alignment in bytes */
>> + uint16_t os_major; /* major OS version */
>> + uint16_t os_minor; /* minor OS version */
>> + uint16_t image_major; /* major image version */
>> + uint16_t image_minor; /* minor image version */
>> + uint16_t subsys_major; /* major subsystem version */
>> + uint16_t subsys_minor; /* minor subsystem version */
>> + uint32_t win32_version; /* reserved, must be 0 */
>> + uint32_t image_size; /* image size */
>> + uint32_t header_size; /* header size rounded up to
>> + file_align */
>> + uint32_t csum; /* checksum */
>> + uint16_t subsys; /* subsystem */
>> + uint16_t dll_flags; /* more flags! */
>> + uint32_t stack_size_req;/* amt of stack requested */
>> + uint32_t stack_size; /* amt of stack required */
>> + uint32_t heap_size_req; /* amt of heap requested */
>> + uint32_t heap_size; /* amt of heap required */
>> + uint32_t loader_flags; /* reserved, must be 0 */
>> + uint32_t data_dirs; /* number of data dir entries */
>> +};
>> +
>> +struct pe32plus_opt_hdr {
>> + uint16_t magic; /* file type */
>> + uint8_t ld_major; /* linker major version */
>> + uint8_t ld_minor; /* linker minor version */
>> + uint32_t text_size; /* size of text section(s) */
>> + uint32_t data_size; /* size of data section(s) */
>> + uint32_t bss_size; /* size of bss section(s) */
>> + uint32_t entry_point; /* file offset of entry point */
>> + uint32_t code_base; /* relative code addr in ram */
>> + /* "windows" header */
>> + uint64_t image_base; /* preferred load address */
>> + uint32_t section_align; /* alignment in bytes */
>> + uint32_t file_align; /* file alignment in bytes */
>> + uint16_t os_major; /* major OS version */
>> + uint16_t os_minor; /* minor OS version */
>> + uint16_t image_major; /* major image version */
>> + uint16_t image_minor; /* minor image version */
>> + uint16_t subsys_major; /* major subsystem version */
>> + uint16_t subsys_minor; /* minor subsystem version */
>> + uint32_t win32_version; /* reserved, must be 0 */
>> + uint32_t image_size; /* image size */
>> + uint32_t header_size; /* header size rounded up to
>> + file_align */
>> + uint32_t csum; /* checksum */
>> + uint16_t subsys; /* subsystem */
>> + uint16_t dll_flags; /* more flags! */
>> + uint64_t stack_size_req;/* amt of stack requested */
>> + uint64_t stack_size; /* amt of stack required */
>> + uint64_t heap_size_req; /* amt of heap requested */
>> + uint64_t heap_size; /* amt of heap required */
>> + uint32_t loader_flags; /* reserved, must be 0 */
>> + uint32_t data_dirs; /* number of data dir entries */
>> +};
>> +
>> +struct data_dirent {
>> + uint32_t virtual_address; /* relative to load address
>*/
>> + uint32_t size;
>> +};
>> +
>> +struct data_directory {
>> + struct data_dirent exports; /* .edata */
>> + struct data_dirent imports; /* .idata */
>> + struct data_dirent resources; /* .rsrc */
>> + struct data_dirent exceptions; /* .pdata */
>> + struct data_dirent certs; /* certs */
>> + struct data_dirent base_relocations; /* .reloc */
>> + struct data_dirent debug; /* .debug */
>> + struct data_dirent arch; /* reservered */
>> + struct data_dirent global_ptr; /* global pointer
>reg. Size=0 */
>> + struct data_dirent tls; /* .tls */
>> + struct data_dirent load_config; /* load configuration
>structure */
>> + struct data_dirent bound_imports; /* no idea */
>> + struct data_dirent import_addrs; /* import address
>table */
>> + struct data_dirent delay_imports; /* delay-load import
>table */
>> + struct data_dirent clr_runtime_hdr; /* .cor (object only)
>*/
>> + struct data_dirent reserved;
>> +};
>> +
>> +struct section_header {
>> + char name[8]; /* name or "/12\0" string tbl
>offset */
>> + uint32_t virtual_size; /* size of loaded section in
>ram */
>> + uint32_t virtual_address; /* relative virtual address
>*/
>> + uint32_t raw_data_size; /* size of the section */
>> + uint32_t data_addr; /* file pointer to first page
>of sec */
>> + uint32_t relocs; /* file pointer to relocation
>entries */
>> + uint32_t line_numbers; /* line numbers! */
>> + uint16_t num_relocs; /* number of relocations */
>> + uint16_t num_lin_numbers; /* srsly. */
>> + uint32_t flags;
>> +};
>> +
>> +/* they actually defined 0x00000000 as well, but I think we'll skip
>that one. */
>> +#define IMAGE_SCN_RESERVED_0 0x00000001
>> +#define IMAGE_SCN_RESERVED_1 0x00000002
>> +#define IMAGE_SCN_RESERVED_2 0x00000004
>> +#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 /* don't pad - obsolete */
>> +#define IMAGE_SCN_RESERVED_3 0x00000010
>> +#define IMAGE_SCN_CNT_CODE 0x00000020 /* .text */
>> +#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 /* .data */
>> +#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 /* .bss */
>> +#define IMAGE_SCN_LNK_OTHER 0x00000100 /* reserved */
>> +#define IMAGE_SCN_LNK_INFO 0x00000200 /* .drectve comments */
>> +#define IMAGE_SCN_RESERVED_4 0x00000400
>> +#define IMAGE_SCN_LNK_REMOVE 0x00000800 /* .o only - scn to be
>rm'd*/
>> +#define IMAGE_SCN_LNK_COMDAT 0x00001000 /* .o only - COMDAT data
>*/
>> +#define IMAGE_SCN_RESERVED_5 0x00002000 /* spec omits this */
>> +#define IMAGE_SCN_RESERVED_6 0x00004000 /* spec omits this */
>> +#define IMAGE_SCN_GPREL 0x00008000 /* global pointer
>referenced data */
>> +/* spec lists 0x20000 twice, I suspect they meant 0x10000 for one of
>them */
>> +#define IMAGE_SCN_MEM_PURGEABLE 0x00010000 /* reserved for
>"future" use */
>> +#define IMAGE_SCN_16BIT 0x00020000 /* reserved for
>"future" use */
>> +#define IMAGE_SCN_LOCKED 0x00040000 /* reserved for "future"
>use */
>> +#define IMAGE_SCN_PRELOAD 0x00080000 /* reserved for "future"
>use */
>> +/* and here they just stuck a 1-byte integer in the middle of a
>bitfield */
>> +#define IMAGE_SCN_ALIGN_1BYTES 0x00100000 /* it does what it says on
>the box */
>> +#define IMAGE_SCN_ALIGN_2BYTES 0x00200000
>> +#define IMAGE_SCN_ALIGN_4BYTES 0x00300000
>> +#define IMAGE_SCN_ALIGN_8BYTES 0x00400000
>> +#define IMAGE_SCN_ALIGN_16BYTES 0x00500000
>> +#define IMAGE_SCN_ALIGN_32BYTES 0x00600000
>> +#define IMAGE_SCN_ALIGN_64BYTES 0x00700000
>> +#define IMAGE_SCN_ALIGN_128BYTES 0x00800000
>> +#define IMAGE_SCN_ALIGN_256BYTES 0x00900000
>> +#define IMAGE_SCN_ALIGN_512BYTES 0x00a00000
>> +#define IMAGE_SCN_ALIGN_1024BYTES 0x00b00000
>> +#define IMAGE_SCN_ALIGN_2048BYTES 0x00c00000
>> +#define IMAGE_SCN_ALIGN_4096BYTES 0x00d00000
>> +#define IMAGE_SCN_ALIGN_8192BYTES 0x00e00000
>> +#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 /* extended relocations
>*/
>> +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 /* scn can be discarded
>*/
>> +#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 /* cannot be cached */
>> +#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 /* not pageable */
>> +#define IMAGE_SCN_MEM_SHARED 0x10000000 /* can be shared */
>> +#define IMAGE_SCN_MEM_EXECUTE 0x20000000 /* can be executed as code
>*/
>> +#define IMAGE_SCN_MEM_READ 0x40000000 /* readable */
>> +#define IMAGE_SCN_MEM_WRITE 0x80000000 /* writeable */
>> +
>> +enum x64_coff_reloc_type {
>> + IMAGE_REL_AMD64_ABSOLUTE = 0,
>> + IMAGE_REL_AMD64_ADDR64,
>> + IMAGE_REL_AMD64_ADDR32,
>> + IMAGE_REL_AMD64_ADDR32N,
>> + IMAGE_REL_AMD64_REL32,
>> + IMAGE_REL_AMD64_REL32_1,
>> + IMAGE_REL_AMD64_REL32_2,
>> + IMAGE_REL_AMD64_REL32_3,
>> + IMAGE_REL_AMD64_REL32_4,
>> + IMAGE_REL_AMD64_REL32_5,
>> + IMAGE_REL_AMD64_SECTION,
>> + IMAGE_REL_AMD64_SECREL,
>> + IMAGE_REL_AMD64_SECREL7,
>> + IMAGE_REL_AMD64_TOKEN,
>> + IMAGE_REL_AMD64_SREL32,
>> + IMAGE_REL_AMD64_PAIR,
>> + IMAGE_REL_AMD64_SSPAN32,
>> +};
>> +
>> +enum arm_coff_reloc_type {
>> + IMAGE_REL_ARM_ABSOLUTE,
>> + IMAGE_REL_ARM_ADDR32,
>> + IMAGE_REL_ARM_ADDR32N,
>> + IMAGE_REL_ARM_BRANCH2,
>> + IMAGE_REL_ARM_BRANCH1,
>> + IMAGE_REL_ARM_SECTION,
>> + IMAGE_REL_ARM_SECREL,
>> +};
>> +
>> +enum sh_coff_reloc_type {
>> + IMAGE_REL_SH3_ABSOLUTE,
>> + IMAGE_REL_SH3_DIRECT16,
>> + IMAGE_REL_SH3_DIRECT32,
>> + IMAGE_REL_SH3_DIRECT8,
>> + IMAGE_REL_SH3_DIRECT8_WORD,
>> + IMAGE_REL_SH3_DIRECT8_LONG,
>> + IMAGE_REL_SH3_DIRECT4,
>> + IMAGE_REL_SH3_DIRECT4_WORD,
>> + IMAGE_REL_SH3_DIRECT4_LONG,
>> + IMAGE_REL_SH3_PCREL8_WORD,
>> + IMAGE_REL_SH3_PCREL8_LONG,
>> + IMAGE_REL_SH3_PCREL12_WORD,
>> + IMAGE_REL_SH3_STARTOF_SECTION,
>> + IMAGE_REL_SH3_SIZEOF_SECTION,
>> + IMAGE_REL_SH3_SECTION,
>> + IMAGE_REL_SH3_SECREL,
>> + IMAGE_REL_SH3_DIRECT32_NB,
>> + IMAGE_REL_SH3_GPREL4_LONG,
>> + IMAGE_REL_SH3_TOKEN,
>> + IMAGE_REL_SHM_PCRELPT,
>> + IMAGE_REL_SHM_REFLO,
>> + IMAGE_REL_SHM_REFHALF,
>> + IMAGE_REL_SHM_RELLO,
>> + IMAGE_REL_SHM_RELHALF,
>> + IMAGE_REL_SHM_PAIR,
>> + IMAGE_REL_SHM_NOMODE,
>> +};
>> +
>> +enum ppc_coff_reloc_type {
>> + IMAGE_REL_PPC_ABSOLUTE,
>> + IMAGE_REL_PPC_ADDR64,
>> + IMAGE_REL_PPC_ADDR32,
>> + IMAGE_REL_PPC_ADDR24,
>> + IMAGE_REL_PPC_ADDR16,
>> + IMAGE_REL_PPC_ADDR14,
>> + IMAGE_REL_PPC_REL24,
>> + IMAGE_REL_PPC_REL14,
>> + IMAGE_REL_PPC_ADDR32N,
>> + IMAGE_REL_PPC_SECREL,
>> + IMAGE_REL_PPC_SECTION,
>> + IMAGE_REL_PPC_SECREL16,
>> + IMAGE_REL_PPC_REFHI,
>> + IMAGE_REL_PPC_REFLO,
>> + IMAGE_REL_PPC_PAIR,
>> + IMAGE_REL_PPC_SECRELLO,
>> + IMAGE_REL_PPC_GPREL,
>> + IMAGE_REL_PPC_TOKEN,
>> +};
>> +
>> +enum x86_coff_reloc_type {
>> + IMAGE_REL_I386_ABSOLUTE,
>> + IMAGE_REL_I386_DIR16,
>> + IMAGE_REL_I386_REL16,
>> + IMAGE_REL_I386_DIR32,
>> + IMAGE_REL_I386_DIR32NB,
>> + IMAGE_REL_I386_SEG12,
>> + IMAGE_REL_I386_SECTION,
>> + IMAGE_REL_I386_SECREL,
>> + IMAGE_REL_I386_TOKEN,
>> + IMAGE_REL_I386_SECREL7,
>> + IMAGE_REL_I386_REL32,
>> +};
>> +
>> +enum ia64_coff_reloc_type {
>> + IMAGE_REL_IA64_ABSOLUTE,
>> + IMAGE_REL_IA64_IMM14,
>> + IMAGE_REL_IA64_IMM22,
>> + IMAGE_REL_IA64_IMM64,
>> + IMAGE_REL_IA64_DIR32,
>> + IMAGE_REL_IA64_DIR64,
>> + IMAGE_REL_IA64_PCREL21B,
>> + IMAGE_REL_IA64_PCREL21M,
>> + IMAGE_REL_IA64_PCREL21F,
>> + IMAGE_REL_IA64_GPREL22,
>> + IMAGE_REL_IA64_LTOFF22,
>> + IMAGE_REL_IA64_SECTION,
>> + IMAGE_REL_IA64_SECREL22,
>> + IMAGE_REL_IA64_SECREL64I,
>> + IMAGE_REL_IA64_SECREL32,
>> + IMAGE_REL_IA64_DIR32NB,
>> + IMAGE_REL_IA64_SREL14,
>> + IMAGE_REL_IA64_SREL22,
>> + IMAGE_REL_IA64_SREL32,
>> + IMAGE_REL_IA64_UREL32,
>> + IMAGE_REL_IA64_PCREL60X,
>> + IMAGE_REL_IA64_PCREL60B,
>> + IMAGE_REL_IA64_PCREL60F,
>> + IMAGE_REL_IA64_PCREL60I,
>> + IMAGE_REL_IA64_PCREL60M,
>> + IMAGE_REL_IA64_IMMGPREL6,
>> + IMAGE_REL_IA64_TOKEN,
>> + IMAGE_REL_IA64_GPREL32,
>> + IMAGE_REL_IA64_ADDEND,
>> +};
>> +
>> +struct coff_reloc {
>> + uint32_t virtual_address;
>> + uint32_t symbol_table_index;
>> + union {
>> + enum x64_coff_reloc_type x64_type;
>> + enum arm_coff_reloc_type arm_type;
>> + enum sh_coff_reloc_type sh_type;
>> + enum ppc_coff_reloc_type ppc_type;
>> + enum x86_coff_reloc_type x86_type;
>> + enum ia64_coff_reloc_type ia64_type;
>> + uint16_t data;
>> + };
>> +};
>> +
>> +/*
>> + * Definitions for the contents of the certs data block
>> + */
>> +#define WIN_CERT_TYPE_PKCS_SIGNED_DATA 0x0002
>> +#define WIN_CERT_TYPE_EFI_OKCS115 0x0EF0
>> +#define WIN_CERT_TYPE_EFI_GUID 0x0EF1
>> +
>> +#define WIN_CERT_REVISION_1_0 0x0100
>> +#define WIN_CERT_REVISION_2_0 0x0200
>> +
>> +struct win_certificate {
>> + uint32_t length;
>> + uint16_t revision;
>> + uint16_t cert_type;
>> +};
>> +
>> +#endif /* __LINUX_PE_H */
>> --
>> 1.9.0
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe
>linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
--
Sent from my mobile phone. Please pardon brevity and lack of formatting.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 2/9] Provide PE binary definitions
2014-07-04 19:12 ` Anca Emanuel
2014-07-04 19:14 ` H. Peter Anvin
@ 2014-07-04 19:16 ` Matthew Garrett
1 sibling, 0 replies; 18+ messages in thread
From: Matthew Garrett @ 2014-07-04 19:16 UTC (permalink / raw)
To: Anca Emanuel
Cc: Vivek Goyal, LKML, Eric W . Biederman, H. Peter Anvin,
Greg Kroah-Hartman, Borislav Petkov, dyoung, chaowang, bhe,
Andrew Morton, dhowells, pjones
On Fri, Jul 04, 2014 at 10:12:51PM +0300, Anca Emanuel wrote:
> Wow MZ ? EXE for MSDOS and Windows ???
>
> After more research, http://en.wikipedia.org/wiki/Portable_Executable
> [quote]PE is a modified version of the Unix COFF (Common Object File
> Format).[/quote]
>
> How can anyone be sure that Microsoft will not sue about this ?
We already build a kernel that's a valid PE executable for UEFI systems.
--
Matthew Garrett | mjg59@srcf.ucam.org
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 3/9] pefile: Parse a PE binary and verify signature
2014-07-03 21:07 [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Vivek Goyal
2014-07-03 21:07 ` [PATCH 1/9] pkcs7: Forward declare struct key in pkcs7.h Vivek Goyal
2014-07-03 21:07 ` [PATCH 2/9] Provide PE binary definitions Vivek Goyal
@ 2014-07-03 21:07 ` Vivek Goyal
2014-07-03 21:07 ` [PATCH 4/9] pefile: Strip the wrapper off of the cert data block Vivek Goyal
` (6 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Vivek Goyal @ 2014-07-03 21:07 UTC (permalink / raw)
To: linux-kernel
Cc: ebiederm, hpa, mjg59, greg, bp, dyoung, chaowang, bhe, akpm,
dhowells, pjones, Vivek Goyal
Parse a PE binary, find pkcs7 signature and verify signature.
v2:
Moved PE file parsing and signature verification in arch/x86/
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
arch/x86/Kconfig | 9 +++
arch/x86/kernel/Makefile | 1 +
arch/x86/kernel/pefile_parser.c | 145 ++++++++++++++++++++++++++++++++++++++++
arch/x86/kernel/pefile_parser.h | 31 +++++++++
4 files changed, 186 insertions(+)
create mode 100644 arch/x86/kernel/pefile_parser.c
create mode 100644 arch/x86/kernel/pefile_parser.h
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 2cee2a6..29b9967 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1574,6 +1574,15 @@ config SECCOMP
source kernel/Kconfig.hz
+config SIGNED_PE_FILE_PARSER
+ bool "Signed PE binary parser"
+ depends on PKCS7_MESSAGE_PARSER=y
+ select ASN1
+ select OID_REGISTRY
+ ---help---
+ This option provides support for parsing signed PE
+ (Protable Executable) binaries.
+
config KEXEC
bool "kexec system call"
select BUILD_BIN2C
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index ece67cb..da7c6b3 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -106,6 +106,7 @@ obj-$(CONFIG_EFI) += sysfb_efi.o
obj-$(CONFIG_PERF_EVENTS) += perf_regs.o
obj-$(CONFIG_TRACING) += tracepoint.o
obj-$(CONFIG_IOSF_MBI) += iosf_mbi.o
+obj-$(CONFIG_SIGNED_PE_FILE_PARSER) += pefile_parser.o
###
# 64 bit specific files
diff --git a/arch/x86/kernel/pefile_parser.c b/arch/x86/kernel/pefile_parser.c
new file mode 100644
index 0000000..72bc2bb
--- /dev/null
+++ b/arch/x86/kernel/pefile_parser.c
@@ -0,0 +1,145 @@
+/* Parse a signed PE binary
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) "PEFILE: "fmt
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+#include <linux/pe.h>
+#include <keys/asymmetric-subtype.h>
+#include <keys/asymmetric-parser.h>
+#include <crypto/hash.h>
+#include <crypto/pkcs7.h>
+#include "pefile_parser.h"
+
+#define kenter(FMT, ...) \
+ pr_devel("==> %s("FMT")\n", __func__, ##__VA_ARGS__)
+#define kleave(FMT, ...) \
+ pr_devel("<== %s()"FMT"\n", __func__, ##__VA_ARGS__)
+
+/*
+ * Parse a PE binary.
+ */
+static int pefile_parse_binary(const void *pebuf, unsigned int pelen,
+ struct pefile_context *ctx)
+{
+ const struct mz_hdr *mz = pebuf;
+ const struct pe_hdr *pe;
+ const struct pe32_opt_hdr *pe32;
+ const struct pe32plus_opt_hdr *pe64;
+ const struct data_directory *ddir;
+ const struct data_dirent *dde;
+ const struct section_header *secs, *sec;
+ size_t cursor, datalen = pelen;
+
+ kenter("");
+
+#define chkaddr(base, x, s) \
+ do { \
+ if ((x) < base || (s) >= datalen || (x) > datalen - (s)) \
+ return -ELIBBAD; \
+ } while (0)
+
+ chkaddr(0, 0, sizeof(*mz));
+ if (mz->magic != MZ_MAGIC)
+ return -ELIBBAD;
+ cursor = sizeof(*mz);
+
+ chkaddr(cursor, mz->peaddr, sizeof(*pe));
+ pe = pebuf + mz->peaddr;
+ if (pe->magic != PE_MAGIC)
+ return -ELIBBAD;
+ cursor = mz->peaddr + sizeof(*pe);
+
+ chkaddr(0, cursor, sizeof(pe32->magic));
+ pe32 = pebuf + cursor;
+ pe64 = pebuf + cursor;
+
+ switch (pe32->magic) {
+ case PE_OPT_MAGIC_PE32:
+ chkaddr(0, cursor, sizeof(*pe32));
+ ctx->image_checksum_offset =
+ (unsigned long)&pe32->csum - (unsigned long)pebuf;
+ ctx->header_size = pe32->header_size;
+ cursor += sizeof(*pe32);
+ ctx->n_data_dirents = pe32->data_dirs;
+ break;
+
+ case PE_OPT_MAGIC_PE32PLUS:
+ chkaddr(0, cursor, sizeof(*pe64));
+ ctx->image_checksum_offset =
+ (unsigned long)&pe64->csum - (unsigned long)pebuf;
+ ctx->header_size = pe64->header_size;
+ cursor += sizeof(*pe64);
+ ctx->n_data_dirents = pe64->data_dirs;
+ break;
+
+ default:
+ pr_debug("Unknown PEOPT magic = %04hx\n", pe32->magic);
+ return -ELIBBAD;
+ }
+
+ pr_debug("checksum @ %x\n", ctx->image_checksum_offset);
+ pr_debug("header size = %x\n", ctx->header_size);
+
+ if (cursor >= ctx->header_size || ctx->header_size >= datalen)
+ return -ELIBBAD;
+
+ if (ctx->n_data_dirents > (ctx->header_size - cursor) / sizeof(*dde))
+ return -ELIBBAD;
+
+ ddir = pebuf + cursor;
+ cursor += sizeof(*dde) * ctx->n_data_dirents;
+
+ ctx->cert_dirent_offset =
+ (unsigned long)&ddir->certs - (unsigned long)pebuf;
+ ctx->certs_size = ddir->certs.size;
+
+ if (!ddir->certs.virtual_address || !ddir->certs.size) {
+ pr_debug("Unsigned PE binary\n");
+ return -EKEYREJECTED;
+ }
+
+ chkaddr(ctx->header_size, ddir->certs.virtual_address,
+ ddir->certs.size);
+ ctx->sig_offset = ddir->certs.virtual_address;
+ ctx->sig_len = ddir->certs.size;
+ pr_debug("cert = %x @%x [%*ph]\n",
+ ctx->sig_len, ctx->sig_offset,
+ ctx->sig_len, pebuf + ctx->sig_offset);
+
+ ctx->n_sections = pe->sections;
+ if (ctx->n_sections > (ctx->header_size - cursor) / sizeof(*sec))
+ return -ELIBBAD;
+ ctx->secs = secs = pebuf + cursor;
+
+ return 0;
+}
+
+/*
+ * Parse a PE binary and verify PKCS7 signature.
+ */
+int pefile_parse_verify_sig(const void *pebuf, unsigned int pelen)
+{
+ struct pefile_context ctx;
+ int ret;
+
+ kenter("");
+
+ memset(&ctx, 0, sizeof(ctx));
+ ret = pefile_parse_binary(pebuf, pelen, &ctx);
+ if (ret < 0)
+ return ret;
+
+ /* Not yet complete */
+ return -ENOANO;
+}
diff --git a/arch/x86/kernel/pefile_parser.h b/arch/x86/kernel/pefile_parser.h
new file mode 100644
index 0000000..e28a7e1
--- /dev/null
+++ b/arch/x86/kernel/pefile_parser.h
@@ -0,0 +1,31 @@
+/* PE Binary parser bits
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#include <crypto/hash_info.h>
+
+struct pefile_context {
+ unsigned header_size;
+ unsigned image_checksum_offset;
+ unsigned cert_dirent_offset;
+ unsigned n_data_dirents;
+ unsigned n_sections;
+ unsigned certs_size;
+ unsigned sig_offset;
+ unsigned sig_len;
+ const struct section_header *secs;
+ void *pkcs7;
+
+ /* PKCS#7 MS Individual Code Signing content */
+ const void *digest; /* Digest */
+ unsigned digest_len; /* Digest length */
+ enum hash_algo digest_algo; /* Digest algorithm */
+};
+
+extern int pefile_parse_verify_sig(const void *pebuf, unsigned int pelen);
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 4/9] pefile: Strip the wrapper off of the cert data block
2014-07-03 21:07 [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Vivek Goyal
` (2 preceding siblings ...)
2014-07-03 21:07 ` [PATCH 3/9] pefile: Parse a PE binary and verify signature Vivek Goyal
@ 2014-07-03 21:07 ` Vivek Goyal
2014-07-03 21:07 ` [PATCH 5/9] pefile: Parse the presumed PKCS#7 content of the certificate blob Vivek Goyal
` (5 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Vivek Goyal @ 2014-07-03 21:07 UTC (permalink / raw)
To: linux-kernel
Cc: ebiederm, hpa, mjg59, greg, bp, dyoung, chaowang, bhe, akpm,
dhowells, pjones, Vivek Goyal
The certificate data block in a PE binary has a wrapper around the PKCS#7
signature we actually want to get at. Strip this off and check that we've got
something that appears to be a PKCS#7 signature.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
arch/x86/kernel/pefile_parser.c | 73 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/arch/x86/kernel/pefile_parser.c b/arch/x86/kernel/pefile_parser.c
index 72bc2bb..088779e 100644
--- a/arch/x86/kernel/pefile_parser.c
+++ b/arch/x86/kernel/pefile_parser.c
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/pe.h>
+#include <linux/asn1.h>
#include <keys/asymmetric-subtype.h>
#include <keys/asymmetric-parser.h>
#include <crypto/hash.h>
@@ -27,6 +28,74 @@
pr_devel("<== %s()"FMT"\n", __func__, ##__VA_ARGS__)
/*
+ * Check and strip the PE wrapper from around the signature and check that the
+ * remnant looks something like PKCS#7.
+ */
+static int pefile_strip_sig_wrapper(const void *pebuf,
+ struct pefile_context *ctx)
+{
+ struct win_certificate wrapper;
+ const u8 *pkcs7;
+
+ if (ctx->sig_len < sizeof(wrapper)) {
+ pr_debug("Signature wrapper too short\n");
+ return -ELIBBAD;
+ }
+
+ memcpy(&wrapper, pebuf + ctx->sig_offset, sizeof(wrapper));
+ pr_debug("sig wrapper = { %x, %x, %x }\n",
+ wrapper.length, wrapper.revision, wrapper.cert_type);
+
+ /*
+ * Both pesign and sbsign round up the length of certificate table
+ * (in optional header data directories) to 8 byte alignment.
+ */
+ if (round_up(wrapper.length, 8) != ctx->sig_len) {
+ pr_debug("Signature wrapper len wrong\n");
+ return -ELIBBAD;
+ }
+ if (wrapper.revision != WIN_CERT_REVISION_2_0) {
+ pr_debug("Signature is not revision 2.0\n");
+ return -ENOTSUPP;
+ }
+ if (wrapper.cert_type != WIN_CERT_TYPE_PKCS_SIGNED_DATA) {
+ pr_debug("Signature certificate type is not PKCS\n");
+ return -ENOTSUPP;
+ }
+
+ /*
+ * Looks like actual pkcs signature length is in wrapper->length.
+ * size obtained from data dir entries lists the total size of
+ * certificate table which is also aligned to octawrod boundary.
+ *
+ * So set signature length field appropriately.
+ */
+ ctx->sig_len = wrapper.length;
+ ctx->sig_offset += sizeof(wrapper);
+ ctx->sig_len -= sizeof(wrapper);
+ if (ctx->sig_len == 0) {
+ pr_debug("Signature data missing\n");
+ return -EKEYREJECTED;
+ }
+
+ /* What's left should a PKCS#7 cert */
+ pkcs7 = pebuf + ctx->sig_offset;
+ if (pkcs7[0] == (ASN1_CONS_BIT | ASN1_SEQ)) {
+ if (pkcs7[1] == 0x82 &&
+ pkcs7[2] == (((ctx->sig_len - 4) >> 8) & 0xff) &&
+ pkcs7[3] == ((ctx->sig_len - 4) & 0xff))
+ return 0;
+ if (pkcs7[1] == 0x80)
+ return 0;
+ if (pkcs7[1] > 0x82)
+ return -EMSGSIZE;
+ }
+
+ pr_debug("Signature data not PKCS#7\n");
+ return -ELIBBAD;
+}
+
+/*
* Parse a PE binary.
*/
static int pefile_parse_binary(const void *pebuf, unsigned int pelen,
@@ -140,6 +209,10 @@ int pefile_parse_verify_sig(const void *pebuf, unsigned int pelen)
if (ret < 0)
return ret;
+ ret = pefile_strip_sig_wrapper(pebuf, &ctx);
+ if (ret < 0)
+ return ret;
+
/* Not yet complete */
return -ENOANO;
}
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 5/9] pefile: Parse the presumed PKCS#7 content of the certificate blob
2014-07-03 21:07 [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Vivek Goyal
` (3 preceding siblings ...)
2014-07-03 21:07 ` [PATCH 4/9] pefile: Strip the wrapper off of the cert data block Vivek Goyal
@ 2014-07-03 21:07 ` Vivek Goyal
2014-07-03 21:07 ` [PATCH 6/9] pefile: Parse the "Microsoft individual code signing" data blob Vivek Goyal
` (4 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Vivek Goyal @ 2014-07-03 21:07 UTC (permalink / raw)
To: linux-kernel
Cc: ebiederm, hpa, mjg59, greg, bp, dyoung, chaowang, bhe, akpm,
dhowells, pjones, Vivek Goyal
Parse the content of the certificate blob, presuming it to be PKCS#7 format.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
arch/x86/kernel/pefile_parser.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/pefile_parser.c b/arch/x86/kernel/pefile_parser.c
index 088779e..e4d3410 100644
--- a/arch/x86/kernel/pefile_parser.c
+++ b/arch/x86/kernel/pefile_parser.c
@@ -199,6 +199,7 @@ static int pefile_parse_binary(const void *pebuf, unsigned int pelen,
*/
int pefile_parse_verify_sig(const void *pebuf, unsigned int pelen)
{
+ void *pkcs7;
struct pefile_context ctx;
int ret;
@@ -213,6 +214,15 @@ int pefile_parse_verify_sig(const void *pebuf, unsigned int pelen)
if (ret < 0)
return ret;
+ pkcs7 = pkcs7_parse_message(pebuf + ctx.sig_offset, ctx.sig_len);
+ if (IS_ERR(pkcs7))
+ return PTR_ERR(pkcs7);
+ ctx.pkcs7 = pkcs7;
+
/* Not yet complete */
- return -ENOANO;
+ ret = -ENOANO;
+
+error:
+ pkcs7_free_message(ctx.pkcs7);
+ return ret;
}
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 6/9] pefile: Parse the "Microsoft individual code signing" data blob
2014-07-03 21:07 [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Vivek Goyal
` (4 preceding siblings ...)
2014-07-03 21:07 ` [PATCH 5/9] pefile: Parse the presumed PKCS#7 content of the certificate blob Vivek Goyal
@ 2014-07-03 21:07 ` Vivek Goyal
2014-07-03 21:07 ` [PATCH 7/9] pefile: Digest the PE binary and compare to the PKCS#7 data Vivek Goyal
` (3 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Vivek Goyal @ 2014-07-03 21:07 UTC (permalink / raw)
To: linux-kernel
Cc: ebiederm, hpa, mjg59, greg, bp, dyoung, chaowang, bhe, akpm,
dhowells, pjones, Vivek Goyal
The PKCS#7 certificate should contain a "Microsoft individual code signing"
data blob as its signed content. This blob contains a digest of the signed
content of the PE binary and the OID of the digest algorithm used (typically
SHA256).
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
arch/x86/kernel/Makefile | 8 ++-
arch/x86/kernel/mscode.asn1 | 28 +++++++++
arch/x86/kernel/mscode_parser.c | 126 ++++++++++++++++++++++++++++++++++++++++
arch/x86/kernel/pefile_parser.c | 6 ++
arch/x86/kernel/pefile_parser.h | 5 ++
include/linux/oid_registry.h | 7 ++-
6 files changed, 178 insertions(+), 2 deletions(-)
create mode 100644 arch/x86/kernel/mscode.asn1
create mode 100644 arch/x86/kernel/mscode_parser.c
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index da7c6b3..72f553e 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -106,7 +106,13 @@ obj-$(CONFIG_EFI) += sysfb_efi.o
obj-$(CONFIG_PERF_EVENTS) += perf_regs.o
obj-$(CONFIG_TRACING) += tracepoint.o
obj-$(CONFIG_IOSF_MBI) += iosf_mbi.o
-obj-$(CONFIG_SIGNED_PE_FILE_PARSER) += pefile_parser.o
+
+obj-$(CONFIG_SIGNED_PE_FILE_PARSER) += pefile_parser.o mscode_parser.o mscode-asn1.o
+
+$(obj)/mscode_parser.o: $(obj)/mscode-asn1.h
+$(obj)/mscode-asn1.o: $(obj)/mscode-asn1.c $(obj)/mscode-asn1.h
+
+clean-files += mscode-asn1.c mscode-asn1.h
###
# 64 bit specific files
diff --git a/arch/x86/kernel/mscode.asn1 b/arch/x86/kernel/mscode.asn1
new file mode 100644
index 0000000..6d09ba4
--- /dev/null
+++ b/arch/x86/kernel/mscode.asn1
@@ -0,0 +1,28 @@
+--- Microsoft individual code signing data blob parser
+---
+--- Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+--- Written by David Howells (dhowells@redhat.com)
+---
+--- This program is free software; you can redistribute it and/or
+--- modify it under the terms of the GNU General Public Licence
+--- as published by the Free Software Foundation; either version
+--- 2 of the Licence, or (at your option) any later version.
+---
+
+MSCode ::= SEQUENCE {
+ type SEQUENCE {
+ contentType ContentType,
+ parameters ANY
+ },
+ content SEQUENCE {
+ digestAlgorithm DigestAlgorithmIdentifier,
+ digest OCTET STRING ({ mscode_note_digest })
+ }
+}
+
+ContentType ::= OBJECT IDENTIFIER ({ mscode_note_content_type })
+
+DigestAlgorithmIdentifier ::= SEQUENCE {
+ algorithm OBJECT IDENTIFIER ({ mscode_note_digest_algo }),
+ parameters ANY OPTIONAL
+}
diff --git a/arch/x86/kernel/mscode_parser.c b/arch/x86/kernel/mscode_parser.c
new file mode 100644
index 0000000..793bc05
--- /dev/null
+++ b/arch/x86/kernel/mscode_parser.c
@@ -0,0 +1,126 @@
+/* Parse a Microsoft Individual Code Signing blob
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) "MSCODE: "fmt
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+#include <linux/oid_registry.h>
+#include <crypto/pkcs7.h>
+#include "pefile_parser.h"
+#include "mscode-asn1.h"
+
+/*
+ * Parse a Microsoft Individual Code Signing blob
+ */
+int mscode_parse(struct pefile_context *ctx)
+{
+ const void *content_data;
+ size_t data_len;
+ int ret;
+
+ ret = pkcs7_get_content_data(ctx->pkcs7, &content_data, &data_len, 1);
+
+ if (ret) {
+ pr_debug("PKCS#7 message does not contain data\n");
+ return ret;
+ }
+
+ pr_devel("Data: %zu [%*ph]\n", data_len, (unsigned)(data_len),
+ content_data);
+
+ return asn1_ber_decoder(&mscode_decoder, ctx, content_data, data_len);
+}
+
+/*
+ * Check the content type OID
+ */
+int mscode_note_content_type(void *context, size_t hdrlen,
+ unsigned char tag,
+ const void *value, size_t vlen)
+{
+ enum OID oid;
+
+ oid = look_up_OID(value, vlen);
+ if (oid == OID__NR) {
+ char buffer[50];
+
+ sprint_oid(value, vlen, buffer, sizeof(buffer));
+ pr_err("Unknown OID: %s\n", buffer);
+ return -EBADMSG;
+ }
+
+ /*
+ * pesign utility had a bug where it was putting
+ * OID_msIndividualSPKeyPurpose instead of OID_msPeImageDataObjId
+ * So allow both OIDs.
+ */
+ if (oid != OID_msPeImageDataObjId &&
+ oid != OID_msIndividualSPKeyPurpose) {
+ pr_err("Unexpected content type OID %u\n", oid);
+ return -EBADMSG;
+ }
+
+ return 0;
+}
+
+/*
+ * Note the digest algorithm OID
+ */
+int mscode_note_digest_algo(void *context, size_t hdrlen,
+ unsigned char tag,
+ const void *value, size_t vlen)
+{
+ struct pefile_context *ctx = context;
+ char buffer[50];
+ enum OID oid;
+
+ oid = look_up_OID(value, vlen);
+ switch (oid) {
+ case OID_md4:
+ ctx->digest_algo = HASH_ALGO_MD4;
+ break;
+ case OID_md5:
+ ctx->digest_algo = HASH_ALGO_MD5;
+ break;
+ case OID_sha1:
+ ctx->digest_algo = HASH_ALGO_SHA1;
+ break;
+ case OID_sha256:
+ ctx->digest_algo = HASH_ALGO_SHA256;
+ break;
+
+ case OID__NR:
+ sprint_oid(value, vlen, buffer, sizeof(buffer));
+ pr_err("Unknown OID: %s\n", buffer);
+ return -EBADMSG;
+
+ default:
+ pr_err("Unsupported content type: %u\n", oid);
+ return -ENOPKG;
+ }
+
+ return 0;
+}
+
+/*
+ * Note the digest we're guaranteeing with this certificate
+ */
+int mscode_note_digest(void *context, size_t hdrlen,
+ unsigned char tag,
+ const void *value, size_t vlen)
+{
+ struct pefile_context *ctx = context;
+
+ ctx->digest = value;
+ ctx->digest_len = vlen;
+ return 0;
+}
diff --git a/arch/x86/kernel/pefile_parser.c b/arch/x86/kernel/pefile_parser.c
index e4d3410..7281217 100644
--- a/arch/x86/kernel/pefile_parser.c
+++ b/arch/x86/kernel/pefile_parser.c
@@ -219,6 +219,12 @@ int pefile_parse_verify_sig(const void *pebuf, unsigned int pelen)
return PTR_ERR(pkcs7);
ctx.pkcs7 = pkcs7;
+ ret = mscode_parse(&ctx);
+ if (ret < 0)
+ goto error;
+ pr_debug("Digest: %u [%*ph]\n", ctx.digest_len, ctx.digest_len,
+ ctx.digest);
+
/* Not yet complete */
ret = -ENOANO;
diff --git a/arch/x86/kernel/pefile_parser.h b/arch/x86/kernel/pefile_parser.h
index e28a7e1..19c7ddc 100644
--- a/arch/x86/kernel/pefile_parser.h
+++ b/arch/x86/kernel/pefile_parser.h
@@ -29,3 +29,8 @@ struct pefile_context {
};
extern int pefile_parse_verify_sig(const void *pebuf, unsigned int pelen);
+
+/*
+ * mscode_parser.c
+ */
+extern int mscode_parse(struct pefile_context *ctx);
diff --git a/include/linux/oid_registry.h b/include/linux/oid_registry.h
index edeff85..c2bbf67 100644
--- a/include/linux/oid_registry.h
+++ b/include/linux/oid_registry.h
@@ -52,8 +52,13 @@ enum OID {
OID_md4, /* 1.2.840.113549.2.4 */
OID_md5, /* 1.2.840.113549.2.5 */
- OID_certAuthInfoAccess, /* 1.3.6.1.5.5.7.1.1 */
+ /* Microsoft Authenticode & Software Publishing */
+ OID_msIndirectData, /* 1.3.6.1.4.1.311.2.1.4 */
+ OID_msPeImageDataObjId, /* 1.3.6.1.4.1.311.2.1.15 */
+ OID_msIndividualSPKeyPurpose, /* 1.3.6.1.4.1.311.2.1.21 */
OID_msOutlookExpress, /* 1.3.6.1.4.1.311.16.4 */
+
+ OID_certAuthInfoAccess, /* 1.3.6.1.5.5.7.1.1 */
OID_sha1, /* 1.3.14.3.2.26 */
OID_sha256, /* 2.16.840.1.101.3.4.2.1 */
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 7/9] pefile: Digest the PE binary and compare to the PKCS#7 data
2014-07-03 21:07 [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Vivek Goyal
` (5 preceding siblings ...)
2014-07-03 21:07 ` [PATCH 6/9] pefile: Parse the "Microsoft individual code signing" data blob Vivek Goyal
@ 2014-07-03 21:07 ` Vivek Goyal
2014-07-03 21:07 ` [PATCH 8/9] PEFILE: Validate PKCS#7 trust chain Vivek Goyal
` (2 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Vivek Goyal @ 2014-07-03 21:07 UTC (permalink / raw)
To: linux-kernel
Cc: ebiederm, hpa, mjg59, greg, bp, dyoung, chaowang, bhe, akpm,
dhowells, pjones, Vivek Goyal
Digest the signed parts of the PE binary, canonicalising the section table
before we need it, and then compare the the resulting digest to the one in the
PKCS#7 signed content.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
arch/x86/kernel/pefile_parser.c | 197 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 197 insertions(+)
diff --git a/arch/x86/kernel/pefile_parser.c b/arch/x86/kernel/pefile_parser.c
index 7281217..f11c254 100644
--- a/arch/x86/kernel/pefile_parser.c
+++ b/arch/x86/kernel/pefile_parser.c
@@ -96,6 +96,192 @@ static int pefile_strip_sig_wrapper(const void *pebuf,
}
/*
+ * Compare two sections for canonicalisation.
+ */
+static int pefile_compare_shdrs(const void *a, const void *b)
+{
+ const struct section_header *shdra = a;
+ const struct section_header *shdrb = b;
+ int rc;
+
+ if (shdra->data_addr > shdrb->data_addr)
+ return 1;
+ if (shdrb->data_addr > shdra->data_addr)
+ return -1;
+
+ if (shdra->virtual_address > shdrb->virtual_address)
+ return 1;
+ if (shdrb->virtual_address > shdra->virtual_address)
+ return -1;
+
+ rc = strcmp(shdra->name, shdrb->name);
+ if (rc != 0)
+ return rc;
+
+ if (shdra->virtual_size > shdrb->virtual_size)
+ return 1;
+ if (shdrb->virtual_size > shdra->virtual_size)
+ return -1;
+
+ if (shdra->raw_data_size > shdrb->raw_data_size)
+ return 1;
+ if (shdrb->raw_data_size > shdra->raw_data_size)
+ return -1;
+
+ return 0;
+}
+
+/*
+ * Load the contents of the PE binary into the digest, leaving out the image
+ * checksum and the certificate data block.
+ */
+static int pefile_digest_pe_contents(const void *pebuf, unsigned int pelen,
+ struct pefile_context *ctx,
+ struct shash_desc *desc)
+{
+ unsigned *canon, tmp, loop, i, hashed_bytes;
+ int ret;
+
+ /* Digest the header and data directory, but leave out the image
+ * checksum and the data dirent for the signature.
+ */
+ ret = crypto_shash_update(desc, pebuf, ctx->image_checksum_offset);
+ if (ret < 0)
+ return ret;
+
+ tmp = ctx->image_checksum_offset + sizeof(uint32_t);
+ ret = crypto_shash_update(desc, pebuf + tmp,
+ ctx->cert_dirent_offset - tmp);
+ if (ret < 0)
+ return ret;
+
+ tmp = ctx->cert_dirent_offset + sizeof(struct data_dirent);
+ ret = crypto_shash_update(desc, pebuf + tmp, ctx->header_size - tmp);
+ if (ret < 0)
+ return ret;
+
+ canon = kcalloc(ctx->n_sections, sizeof(unsigned), GFP_KERNEL);
+ if (!canon)
+ return -ENOMEM;
+
+ /* We have to canonicalise the section table, so we perform an
+ * insertion sort.
+ */
+ canon[0] = 0;
+ for (loop = 1; loop < ctx->n_sections; loop++) {
+ for (i = 0; i < loop; i++) {
+ if (pefile_compare_shdrs(&ctx->secs[canon[i]],
+ &ctx->secs[loop]) > 0) {
+ memmove(&canon[i + 1], &canon[i],
+ (loop - i) * sizeof(canon[0]));
+ break;
+ }
+ }
+ canon[i] = loop;
+ }
+
+ hashed_bytes = ctx->header_size;
+ for (loop = 0; loop < ctx->n_sections; loop++) {
+ i = canon[loop];
+ if (ctx->secs[i].raw_data_size == 0)
+ continue;
+ ret = crypto_shash_update(desc,
+ pebuf + ctx->secs[i].data_addr,
+ ctx->secs[i].raw_data_size);
+ if (ret < 0) {
+ kfree(canon);
+ return ret;
+ }
+ hashed_bytes += ctx->secs[i].raw_data_size;
+ }
+ kfree(canon);
+
+ if (pelen > hashed_bytes) {
+ tmp = hashed_bytes + ctx->certs_size;
+ ret = crypto_shash_update(desc,
+ pebuf + hashed_bytes,
+ pelen - tmp);
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
+/*
+ * Digest the contents of the PE binary, leaving out the image checksum and the
+ * certificate data block.
+ */
+static int pefile_digest_pe(const void *pebuf, unsigned int pelen,
+ struct pefile_context *ctx)
+{
+ struct crypto_shash *tfm;
+ struct shash_desc *desc;
+ size_t digest_size, desc_size;
+ void *digest;
+ int ret;
+
+ kenter(",%u", ctx->digest_algo);
+
+ /* Allocate the hashing algorithm we're going to need and find out how
+ * big the hash operational data will be.
+ */
+ tfm = crypto_alloc_shash(hash_algo_name[ctx->digest_algo], 0, 0);
+ if (IS_ERR(tfm))
+ return (PTR_ERR(tfm) == -ENOENT) ? -ENOPKG : PTR_ERR(tfm);
+
+ desc_size = crypto_shash_descsize(tfm) + sizeof(*desc);
+ digest_size = crypto_shash_digestsize(tfm);
+
+ if (digest_size != ctx->digest_len) {
+ pr_debug("Digest size mismatch (%zx != %x)\n",
+ digest_size, ctx->digest_len);
+ ret = -EBADMSG;
+ goto error_no_desc;
+ }
+ pr_debug("Digest: desc=%zu size=%zu\n", desc_size, digest_size);
+
+ ret = -ENOMEM;
+ desc = kzalloc(desc_size + digest_size, GFP_KERNEL);
+ if (!desc)
+ goto error_no_desc;
+
+ desc->tfm = tfm;
+ desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
+ ret = crypto_shash_init(desc);
+ if (ret < 0)
+ goto error;
+
+ ret = pefile_digest_pe_contents(pebuf, pelen, ctx, desc);
+ if (ret < 0)
+ goto error;
+
+ digest = (void *)desc + desc_size;
+ ret = crypto_shash_final(desc, digest);
+ if (ret < 0)
+ goto error;
+
+ pr_debug("Digest calc = [%*ph]\n", ctx->digest_len, digest);
+
+ /* Check that the PE file digest matches that in the MSCODE part of the
+ * PKCS#7 certificate.
+ */
+ if (memcmp(digest, ctx->digest, ctx->digest_len) != 0) {
+ pr_debug("Digest mismatch\n");
+ ret = -EKEYREJECTED;
+ } else {
+ pr_debug("The digests match!\n");
+ }
+
+error:
+ kfree(desc);
+error_no_desc:
+ crypto_free_shash(tfm);
+ kleave(" = %d", ret);
+ return ret;
+}
+
+/*
* Parse a PE binary.
*/
static int pefile_parse_binary(const void *pebuf, unsigned int pelen,
@@ -225,6 +411,17 @@ int pefile_parse_verify_sig(const void *pebuf, unsigned int pelen)
pr_debug("Digest: %u [%*ph]\n", ctx.digest_len, ctx.digest_len,
ctx.digest);
+ /* Generate the digest and check against the PKCS7 certificate
+ * contents.
+ */
+ ret = pefile_digest_pe(pebuf, pelen, &ctx);
+ if (ret < 0)
+ goto error;
+
+ ret = pkcs7_verify(pkcs7);
+ if (ret < 0)
+ goto error;
+
/* Not yet complete */
ret = -ENOANO;
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 8/9] PEFILE: Validate PKCS#7 trust chain
2014-07-03 21:07 [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Vivek Goyal
` (6 preceding siblings ...)
2014-07-03 21:07 ` [PATCH 7/9] pefile: Digest the PE binary and compare to the PKCS#7 data Vivek Goyal
@ 2014-07-03 21:07 ` Vivek Goyal
2014-07-03 21:07 ` [PATCH 9/9] kexec: Verify the signature of signed PE bzImage Vivek Goyal
2014-07-04 14:51 ` [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Borislav Petkov
9 siblings, 0 replies; 18+ messages in thread
From: Vivek Goyal @ 2014-07-03 21:07 UTC (permalink / raw)
To: linux-kernel
Cc: ebiederm, hpa, mjg59, greg, bp, dyoung, chaowang, bhe, akpm,
dhowells, pjones, Vivek Goyal
Validate the PKCS#7 trust chain against the contents of the system keyring.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
arch/x86/Kconfig | 1 +
arch/x86/kernel/pefile_parser.c | 12 +++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 29b9967..741d90d 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1579,6 +1579,7 @@ config SIGNED_PE_FILE_PARSER
depends on PKCS7_MESSAGE_PARSER=y
select ASN1
select OID_REGISTRY
+ select SYSTEM_TRUSTED_KEYRING
---help---
This option provides support for parsing signed PE
(Protable Executable) binaries.
diff --git a/arch/x86/kernel/pefile_parser.c b/arch/x86/kernel/pefile_parser.c
index f11c254..de61279 100644
--- a/arch/x86/kernel/pefile_parser.c
+++ b/arch/x86/kernel/pefile_parser.c
@@ -18,6 +18,7 @@
#include <linux/asn1.h>
#include <keys/asymmetric-subtype.h>
#include <keys/asymmetric-parser.h>
+#include <keys/system_keyring.h>
#include <crypto/hash.h>
#include <crypto/pkcs7.h>
#include "pefile_parser.h"
@@ -388,6 +389,7 @@ int pefile_parse_verify_sig(const void *pebuf, unsigned int pelen)
void *pkcs7;
struct pefile_context ctx;
int ret;
+ bool trusted;
kenter("");
@@ -421,9 +423,13 @@ int pefile_parse_verify_sig(const void *pebuf, unsigned int pelen)
ret = pkcs7_verify(pkcs7);
if (ret < 0)
goto error;
-
- /* Not yet complete */
- ret = -ENOANO;
+ /*
+ * Trust is being verified against system_trusted_keyring. This is
+ * a trusted keyring and all the keys in this keyring should be
+ * trusted. So there should not be any need to check "trusted"
+ * parameter.
+ */
+ ret = pkcs7_validate_trust(pkcs7, system_trusted_keyring, &trusted);
error:
pkcs7_free_message(ctx.pkcs7);
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 9/9] kexec: Verify the signature of signed PE bzImage
2014-07-03 21:07 [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Vivek Goyal
` (7 preceding siblings ...)
2014-07-03 21:07 ` [PATCH 8/9] PEFILE: Validate PKCS#7 trust chain Vivek Goyal
@ 2014-07-03 21:07 ` Vivek Goyal
2014-07-04 14:51 ` [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Borislav Petkov
9 siblings, 0 replies; 18+ messages in thread
From: Vivek Goyal @ 2014-07-03 21:07 UTC (permalink / raw)
To: linux-kernel
Cc: ebiederm, hpa, mjg59, greg, bp, dyoung, chaowang, bhe, akpm,
dhowells, pjones, Vivek Goyal
Well all the hard work is done in previous patches. Now bzImage loader
has just call into that code and verify whether bzImage signature are
valid or not.
Also create two config options. First one is CONFIG_KEXEC_VERIFY_SIG.
This option enforces that kernel has to be validly signed otherwise
kernel load will fail. If this option is not set, no signature verification
will be done. Only exception will be when secureboot is enabled. In that
case signature verification should be automatically enforced when secureboot
is enabled. But that will happen when secureboot patches are merged.
Second config option is CONFIG_KEXEC_BZIMAGE_VERIFY_SIG. This option
enables signature verification support on bzImage. If this option is
not set and previous one is set, kernel image loading will fail because
kernel does not have support to verify signature of bzImage.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
arch/x86/Kconfig | 21 +++++++++++++++++++++
arch/x86/kernel/kexec-bzimage64.c | 11 +++++++++++
arch/x86/kernel/machine_kexec_64.c | 11 +++++++++++
include/linux/kexec.h | 3 +++
kernel/kexec.c | 15 +++++++++++++++
5 files changed, 61 insertions(+)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 741d90d..08fcaa1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1603,6 +1603,27 @@ config KEXEC
interface is strongly in flux, so no good recommendation can be
made.
+config KEXEC_VERIFY_SIG
+ bool "Verify kernel signature during kexec_file_load() syscall"
+ depends on KEXEC
+ ---help---
+ This option makes kernel signature verification mandatory for
+ kexec_file_load() syscall. If kernel is signature can not be
+ verified, kexec_file_load() will fail.
+
+ This option enforces signature verification at generic level.
+ One needs to enable signature verification for type of kernel
+ image being loaded to make sure it works. For example, enable
+ bzImage signature verification option to be able to load and
+ verify signatures of bzImage. Otherwise kernel loading will fail.
+
+config KEXEC_BZIMAGE_VERIFY_SIG
+ bool "Enable bzImage signature verification support"
+ depends on KEXEC_VERIFY_SIG
+ depends on SIGNED_PE_FILE_PARSER
+ ---help---
+ Enable bzImage signature verification support.
+
config CRASH_DUMP
bool "kernel crash dumps"
depends on X86_64 || (X86_32 && HIGHMEM)
diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
index 623e6c5..39492e7 100644
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@ -24,6 +24,7 @@
#include <asm/setup.h>
#include <asm/crash.h>
#include <asm/efi.h>
+#include "pefile_parser.h"
#define MAX_ELFCOREHDR_STR_LEN 30 /* elfcorehdr=0x<64bit-value> */
@@ -525,8 +526,18 @@ int bzImage64_cleanup(void *loader_data)
return 0;
}
+#ifdef CONFIG_KEXEC_BZIMAGE_VERIFY_SIG
+int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len)
+{
+ return pefile_parse_verify_sig(kernel, kernel_len);
+}
+#endif
+
struct kexec_file_ops kexec_bzImage64_ops = {
.probe = bzImage64_probe,
.load = bzImage64_load,
.cleanup = bzImage64_cleanup,
+#ifdef CONFIG_KEXEC_BZIMAGE_VERIFY_SIG
+ .verify_sig = bzImage64_verify_sig,
+#endif
};
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index 9330434..8b04018 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@ -372,6 +372,17 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)
return image->fops->cleanup(image->image_loader_data);
}
+int arch_kexec_kernel_verify_sig(struct kimage *image, void *kernel,
+ unsigned long kernel_len)
+{
+ if (!image->fops || !image->fops->verify_sig) {
+ pr_debug("kernel loader does not support signature verification.");
+ return -EKEYREJECTED;
+ }
+
+ return image->fops->verify_sig(kernel, kernel_len);
+}
+
/*
* Apply purgatory relocations.
*
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 9481703..4b2a0e1 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -191,11 +191,14 @@ typedef void *(kexec_load_t)(struct kimage *image, char *kernel_buf,
unsigned long initrd_len, char *cmdline,
unsigned long cmdline_len);
typedef int (kexec_cleanup_t)(void *loader_data);
+typedef int (kexec_verify_sig_t)(const char *kernel_buf,
+ unsigned long kernel_len);
struct kexec_file_ops {
kexec_probe_t *probe;
kexec_load_t *load;
kexec_cleanup_t *cleanup;
+ kexec_verify_sig_t *verify_sig;
};
/* kexec interface functions */
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 3cd56af..564432a 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -415,6 +415,12 @@ void __weak arch_kimage_file_post_load_cleanup(struct kimage *image)
{
}
+int __weak arch_kexec_kernel_verify_sig(struct kimage *image, void *buf,
+ unsigned long buf_len)
+{
+ return -EKEYREJECTED;
+}
+
/* Apply relocations of type RELA */
int __weak
arch_kexec_apply_relocations_add(const Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,
@@ -493,6 +499,15 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,
if (ret)
goto out;
+#ifdef CONFIG_KEXEC_VERIFY_SIG
+ ret = arch_kexec_kernel_verify_sig(image, image->kernel_buf,
+ image->kernel_buf_len);
+ if (ret) {
+ pr_debug("kernel signature verification failed.\n");
+ goto out;
+ }
+ pr_debug("kernel signature verification successful.\n");
+#endif
/* It is possible that there no initramfs is being loaded */
if (!(flags & KEXEC_FILE_NO_INITRAMFS)) {
ret = copy_file_from_fd(initrd_fd, &image->initrd_buf,
--
1.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage
2014-07-03 21:07 [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Vivek Goyal
` (8 preceding siblings ...)
2014-07-03 21:07 ` [PATCH 9/9] kexec: Verify the signature of signed PE bzImage Vivek Goyal
@ 2014-07-04 14:51 ` Borislav Petkov
2014-07-05 3:01 ` Vivek Goyal
9 siblings, 1 reply; 18+ messages in thread
From: Borislav Petkov @ 2014-07-04 14:51 UTC (permalink / raw)
To: Vivek Goyal
Cc: linux-kernel, ebiederm, hpa, mjg59, greg, dyoung, chaowang, bhe,
akpm, dhowells, pjones, Linus Torvalds
On Thu, Jul 03, 2014 at 05:07:12PM -0400, Vivek Goyal wrote:
> Hi,
>
> This patch series enables signature verification of signed PE bzimage. This
> patches series needs two more patch series before it.
>
> First one is kexec_file_load() syscall support posted here.
>
> https://lkml.org/lkml/2014/6/26/497
>
> This patch seris is also available in -mm tree now.
>
> Second one is PKCS7 signature parsing and verification support. These
> patches are available in David Howells's modsign tree in pkcs7 branch.
>
> https://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-modsign.git/log/?h=pkcs7
>
> This patch series is based on David Howells's work of PE file parsing
> and PKCS7 signature verificaiton. Now PKCS7 signature part is available
> in his tree. So I have taken PE file parsing patches, changed them a
> bit and posting these here.
Ok, now this looks strange. You're referring to those patches without
posting them together with yours. And they're in some repo. Normally in
such cases people post the *whole* patchset and do not refer to some
other tree.
>From looking at them, they're part of the pull request which Linus did
shot down already last year:
https://lkml.org/lkml/2013/2/21/228
And he explicitly stated then that we don't want PE file parsing in the
kernel, AFAICR. What changed since then?
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage
2014-07-04 14:51 ` [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage Borislav Petkov
@ 2014-07-05 3:01 ` Vivek Goyal
2014-07-08 15:54 ` Borislav Petkov
0 siblings, 1 reply; 18+ messages in thread
From: Vivek Goyal @ 2014-07-05 3:01 UTC (permalink / raw)
To: Borislav Petkov
Cc: linux-kernel, ebiederm, hpa, mjg59, greg, dyoung, chaowang, bhe,
akpm, dhowells, pjones, Linus Torvalds
On Fri, Jul 04, 2014 at 04:51:18PM +0200, Borislav Petkov wrote:
> On Thu, Jul 03, 2014 at 05:07:12PM -0400, Vivek Goyal wrote:
> > Hi,
> >
> > This patch series enables signature verification of signed PE bzimage. This
> > patches series needs two more patch series before it.
> >
> > First one is kexec_file_load() syscall support posted here.
> >
> > https://lkml.org/lkml/2014/6/26/497
> >
> > This patch seris is also available in -mm tree now.
> >
> > Second one is PKCS7 signature parsing and verification support. These
> > patches are available in David Howells's modsign tree in pkcs7 branch.
> >
> > https://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-modsign.git/log/?h=pkcs7
> >
> > This patch series is based on David Howells's work of PE file parsing
> > and PKCS7 signature verificaiton. Now PKCS7 signature part is available
> > in his tree. So I have taken PE file parsing patches, changed them a
> > bit and posting these here.
>
> Ok, now this looks strange. You're referring to those patches without
> posting them together with yours. And they're in some repo. Normally in
> such cases people post the *whole* patchset and do not refer to some
> other tree.
>
> >From looking at them, they're part of the pull request which Linus did
> shot down already last year:
>
> https://lkml.org/lkml/2013/2/21/228
>
> And he explicitly stated then that we don't want PE file parsing in the
> kernel, AFAICR. What changed since then?
I think use case has changed since then. My impression was that Linus
primarily did not like the idea of carrying keys in PE files. He said
we have x509 for that.
This time that's not the use case. We have dropped those patches. In fact
no keys are being added. I am just verifying the signature of PE bzImage
against a key in system_trusted_keyring.
We already generate PE bzImage and have code to generate right PE header
for bzImage.
In Linux Plumbers last year idea was to append signatures to kernel image
(like modules). But later I found out that it will not work as if I append
another signature to already signed PE image, PE signatures will be broken.
And given that distributions are already shipping signe PE bzImage, it
made sense to parse and verify those signatures instead of trying to
come up with a mechanism so that two signatures can co-exist and sign
images twice.
Given that this time we have a new use case, I am hoping that idea of
parsing PE and verifying signature is more acceptable.
Thanks
Vivek
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage
2014-07-05 3:01 ` Vivek Goyal
@ 2014-07-08 15:54 ` Borislav Petkov
2014-07-08 16:07 ` Vivek Goyal
0 siblings, 1 reply; 18+ messages in thread
From: Borislav Petkov @ 2014-07-08 15:54 UTC (permalink / raw)
To: Vivek Goyal
Cc: linux-kernel, ebiederm, hpa, mjg59, greg, dyoung, chaowang, bhe,
akpm, dhowells, pjones, Linus Torvalds
On Fri, Jul 04, 2014 at 11:01:34PM -0400, Vivek Goyal wrote:
> Given that this time we have a new use case, I am hoping that idea of
> parsing PE and verifying signature is more acceptable.
Maybe.
In any case, I still think that you should post the full patch set and
not refer to some repo so that people can take a look at the whole
thing.
I'll fiddle them out now from David's branch but please add them to your
next submission.
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage
2014-07-08 15:54 ` Borislav Petkov
@ 2014-07-08 16:07 ` Vivek Goyal
2014-07-08 16:12 ` Borislav Petkov
0 siblings, 1 reply; 18+ messages in thread
From: Vivek Goyal @ 2014-07-08 16:07 UTC (permalink / raw)
To: Borislav Petkov
Cc: linux-kernel, ebiederm, hpa, mjg59, greg, dyoung, chaowang, bhe,
akpm, dhowells, pjones, Linus Torvalds
On Tue, Jul 08, 2014 at 05:54:14PM +0200, Borislav Petkov wrote:
> On Fri, Jul 04, 2014 at 11:01:34PM -0400, Vivek Goyal wrote:
> > Given that this time we have a new use case, I am hoping that idea of
> > parsing PE and verifying signature is more acceptable.
>
> Maybe.
>
> In any case, I still think that you should post the full patch set and
> not refer to some repo so that people can take a look at the whole
> thing.
>
Is referring to other posting is fine?
David Howells just posted PKCS7 patches on lkml.
https://lkml.org/lkml/2014/7/8/332
> I'll fiddle them out now from David's branch but please add them to your
> next submission.
So may be I can refer to above post in my next posting. Will that work? As
he is working on the those patches, I thought it would make sense if he
does the posting and I simply refer to these patches.
Thanks
Vivek
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [RFC PATCH 0/9] kexec: Verify signature of PE signed bzImage
2014-07-08 16:07 ` Vivek Goyal
@ 2014-07-08 16:12 ` Borislav Petkov
0 siblings, 0 replies; 18+ messages in thread
From: Borislav Petkov @ 2014-07-08 16:12 UTC (permalink / raw)
To: Vivek Goyal
Cc: linux-kernel, ebiederm, hpa, mjg59, greg, dyoung, chaowang, bhe,
akpm, dhowells, pjones, Linus Torvalds
On Tue, Jul 08, 2014 at 12:07:20PM -0400, Vivek Goyal wrote:
> So may be I can refer to above post in my next posting. Will that work?
Sure, someone needed to post them for review. :)
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
^ permalink raw reply [flat|nested] 18+ messages in thread