verify_pefile_signature() and a message field of MZ header in pe.h
Hi David,
Struct mz_hdr in include/linux/pe.h contains a message[] field. Should it be part of this structure?
(I googled "MZ format," but didn't find out the exact definition.)
I'm now working on kexec_file_load support on arm64. As arm64's Image binary can be seen as in PE format, verify_pefile_signature() is used to assure integrity as on x86.
But this attempt fails (ELIBBAD) at pefile_parse_binary():
---8<---
#define chkaddr(base, x, s) \
do { \
if ((x) < base || (s) >= datalen || (x) > datalen - (s)) \
return -ELIBBAD; \
} while (0)
...
cursor = sizeof(*mz);
chkaddr(cursor, mz->peaddr, sizeof(*pe)); <-- Here
pe = pebuf + mz->peaddr;
if (pe->magic != PE_MAGIC)
return -ELIBBAD;
--->8---because our Image doesn't have message[] in a pseudo header and so mz->peaddr is not beyond sizeof(*mz).
I think we can fix this issue, either
(a) remove message[] from struct mz_hdr
(b) modify a check by chkaddr() macro
(c) add a dummy pad into arm64's binary
Which one should we follow here?
Thanks,
-Takahiro AKASHI
Quoted 6 lines · AKASHI Takahiro
Hi David,
Struct
mz_hdrininclude/linux/pe.hcontains a message[] field. Should it be part of this structure?
(I googled "MZ format," but didn't find out the exact definition.)
MZ format does not exist. It is the magic number of the DOS header, and MZ are the initials of one of the MS-DOS developers.
Quoted 25 lines
I'm now working on
kexec_file_loadsupport on arm64. As arm64's Image binary can be seen as in PE format,verify_pefile_signature()is used to assure integrity as on x86.
But this attempt fails (ELIBBAD) atpefile_parse_binary():---8<--- #define chkaddr(base, x, s) \ do { \ if ((x) < base || (s) >= datalen || (x) > datalen - (s)) \ return -ELIBBAD; \ } while (0) ... cursor = sizeof(*mz); chkaddr(cursor, mz->peaddr, sizeof(*pe)); <-- Here pe = pebuf + mz->peaddr; if (pe->magic != PE_MAGIC) return -ELIBBAD; --->8---because our Image doesn't have message[] in a pseudo header and so
mz->peaddris not beyondsizeof(*mz).
Quoted 7 lines
I think we can fix this issue, either
(a) remove message[] from structmz_hdr
(b) modify a check bychkaddr()macro
(c) add a dummy pad into arm64's binaryWhich one should we follow here?
I think the simplest yet correct approach is to omit the size from 'message', i.e.,
include/linux/pe.h +1 -1
@@ -43,7 +43,7 @@ struct mz_hdr {uint16_t oem_info;/* oem specific */ uint16_t reserved1[10 ];/* reserved */ uint32_t peaddr;/* address of pe header */ -char message[64 ];/* message to print */ +char message[];/* message to print */ };struct mz_reloc {
This is appropriate since we are not parsing random MS-DOS files here but PE/COFF binaries, and the PE/COFF spec does not specify a minimum size for the so-called MS-DOS stub, which populates the region between the DOS and PE headers. It does specify that its purpose is MS-DOS 2.0 compatibility, which seems a bit pointless for PE/COFF on ARM/arm64 systems.
David Howells
maintainerQuoted 2 lines · AKASHI Takahiro
Struct
mz_hdrininclude/linux/pe.hcontains a message[] field. Should it be part of this structure?
You'd probably be better off asking Peter Jones - he wrote the original code that I copied into the kernel.
David