| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <479E5D22.1070109@goop.org>
Date: Mon, 28 Jan 2008 14:54:26 -0800
From: Jeremy Fitzhardinge <jeremy@...p.org>
To: Ian Campbell <ijc@...lion.org.uk>
CC: "H. Peter Anvin" <hpa@...or.com>, linux-kernel@...r.kernel.org,
"Eric W. Biederman" <ebiederm@...ssion.com>
Subject: Re: PATCH/RFC: bzImage payload as compressed ELF file.
Ian Campbell wrote:
> I'm mainly interested in something along these lines to allow the Xen
> bootloader to load a bzImage so that distros don't have to maintain two
> kernel packages with the same basic bits in different file formats, I
> think it would probably be of use to the kexec and/or lguest folks too.
>
> The patch boots on native 32 and 64 bit x86. I haven't done the matching
> Xen domain builder work but the attached bzexplode.c is a trivial/ugly
> (don't judge me based on it ;-)) test app which extracts the payload,
> which I have been able to boot as a 32 bit Xen domU, as you'd expect.
>
I've got a bzImage-loading domain builder patch somewhere. It's based
on my version of what you've done here, which isn't very different.
> The payload is simply the stripped and compressed toplevel vmlinux file.
> I assume that ELF program headers will be ordered by physical address
> within the ELF file since this (and the general simplicity of the kernel
> ELF layout) makes the ELF "parser" pretty trivial. I think the
> assumption is safe because for the kernel paddr=vaddr-offset and the ELF
> spec says (in book I chapter 2 "Program Header"):
> Loadable segment entries in the program header table appear in
> ascending order, sorted on the p_vaddr member.
> Slightly less obvious is if the data within the ELF file is in the same
> order as the program headers. I think the kernel is constrained enough
> that we can guarantee this.
>
The problem I ran into is that 32-bit boot loaders expect to be able to
load the payload portion of the bzImage and simply jmp 0x100000, which
would start executing the ELF header. Someone (Vivek Goyal?) did a
neat/bizarre/awful hack which made the ELF header itself executable,
which wasn't something I felt should live.
> What would be the preferred way of allowing bootloaders/domain builders
> to find the compressed payload? Tacking the offset from the end onto the
> end as I have done for the moment seems pretty skanky...
>
The header format is extensible, so you just up the bootloader revision
and put the appropriate extra members.
J
> Ian.
>
> x86: switch compressed payload to ELF format.
>
> This allows other boot loaders such as the Xen domain builder the
> opportunity to extract the ELF file.
>
> diff --git a/arch/x86/Makefile b/arch/x86/Makefile
> index b7541a4..69d740b 100644
> --- a/arch/x86/Makefile
> +++ b/arch/x86/Makefile
> @@ -90,7 +90,6 @@ KBUILD_AFLAGS += $(cfi) $(cfi-sigframe)
> KBUILD_CFLAGS += $(cfi) $(cfi-sigframe)
>
> LDFLAGS := -m elf_$(UTS_MACHINE)
> -OBJCOPYFLAGS := -O binary -R .note -R .comment -S
>
> # Speed up the build
> KBUILD_CFLAGS += -pipe
> diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
> index 349b81a..23fddca 100644
> --- a/arch/x86/boot/Makefile
> +++ b/arch/x86/boot/Makefile
> @@ -80,6 +80,7 @@ $(obj)/zImage $(obj)/bzImage: $(obj)/setup.bin \
> $(call if_changed,image)
> @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
>
> +$(obj)/vmlinux.bin: OBJCOPYFLAGS := -O binary -R .note -R .comment -S
> $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
> $(call if_changed,objcopy)
>
> diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
> index fe24cea..aedea1c 100644
> --- a/arch/x86/boot/compressed/Makefile
> +++ b/arch/x86/boot/compressed/Makefile
> @@ -22,6 +22,7 @@ $(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o $(obj)/misc.o $
> $(call if_changed,ld)
> @:
>
> +$(obj)/vmlinux.bin: OBJCOPYFLAGS := -R .comment --strip-all
> $(obj)/vmlinux.bin: vmlinux FORCE
> $(call if_changed,objcopy)
>
> diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
> index 8182e32..2eb8a8b 100644
> --- a/arch/x86/boot/compressed/misc.c
> +++ b/arch/x86/boot/compressed/misc.c
> @@ -15,6 +15,10 @@
> * we just keep it from happening
> */
> #undef CONFIG_PARAVIRT
> +#ifdef CONFIG_X86_32
> +#define _ASM_DESC_H_ 1
> +#endif
> +
> #ifdef CONFIG_X86_64
> #define _LINUX_STRING_H_ 1
> #define __LINUX_BITMAP_H 1
> @@ -22,6 +26,7 @@
>
> #include <linux/linkage.h>
> #include <linux/screen_info.h>
> +#include <linux/elf.h>
> #include <asm/io.h>
> #include <asm/page.h>
> #include <asm/boot.h>
> @@ -365,6 +370,71 @@ static void error(char *x)
> asm("hlt");
> }
>
> +static void parse_elf(void *output)
> +{
> +#ifdef CONFIG_X86_64
> + Elf64_Ehdr ehdr;
> + Elf64_Phdr *phdrs, *phdr;
> +#else
> + Elf32_Ehdr ehdr;
> + Elf32_Phdr *phdrs, *phdr;
> +#endif
> + int i;
> +
> + memcpy(&ehdr, output, sizeof(ehdr));
> + if(ehdr.e_ident[EI_MAG0] != ELFMAG0 ||
> + ehdr.e_ident[EI_MAG1] != ELFMAG1 ||
> + ehdr.e_ident[EI_MAG2] != ELFMAG2 ||
> + ehdr.e_ident[EI_MAG3] != ELFMAG3)
> + {
> + putstr("Not ELF... ");
> + return;
> + }
> +
> + putstr("Parsing ELF... ");
> +
> + phdrs = malloc(sizeof(*phdrs) * ehdr.e_phnum);
> + if (!phdrs)
> + error("Failed to allocate space for phdrs");
> +
> + memcpy(phdrs, output + ehdr.e_phoff, sizeof(*phdrs) * ehdr.e_phnum);
> +
> + for (i=0; i<ehdr.e_phnum; i++) {
> + phdr = &phdrs[i];
> + switch (phdr->p_type) {
> + case PT_NULL:
> + putstr("\nIgnoring PT_NULL PHDR... ");
> + break;
> + case PT_LOAD:
> + putstr("\nProcessing PT_LOAD PHDR... ");
> + memcpy((void*)phdr->p_paddr,
> + output + phdr->p_offset,
> + phdr->p_filesz);
> + break;
> + case PT_DYNAMIC:
> + putstr("\nIgnoring PT_DYNAMIC PHDR... ");
> + break;
> + case PT_INTERP:
> + putstr("\nIgnoring PT_INTERP PHDR... ");
> + break;
> + case PT_NOTE:
> + putstr("\nIgnoring PT_NOTE PHDR... ");
> + break;
> + case PT_SHLIB:
> + putstr("\nIgnoring PT_SHLIB PHDR... ");
> + break;
> + case PT_PHDR:
> + putstr("\nIgnoring PT_PHDR PHDR... ");
> + break;
> + case PT_TLS:
> + putstr("\nIgnoring PT_TLS PHDR... ");
> + break;
> + default:
> + putstr("\nIgnoring unknown PHDR... ");
> + }
> + }
> +}
> +
> asmlinkage void decompress_kernel(void *rmode, memptr heap,
> uch *input_data, unsigned long input_len,
> uch *output)
> @@ -408,6 +478,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
> makecrc();
> putstr("\nDecompressing Linux... ");
> gunzip();
> + parse_elf(output);
> putstr("done.\nBooting the kernel.\n");
> return;
> }
> diff --git a/arch/x86/boot/compressed/vmlinux_32.lds b/arch/x86/boot/compressed/vmlinux_32.lds
> index bb3c483..1eb2a02 100644
> --- a/arch/x86/boot/compressed/vmlinux_32.lds
> +++ b/arch/x86/boot/compressed/vmlinux_32.lds
> @@ -40,4 +40,8 @@ SECTIONS
> *(COMMON)
> _end = . ;
> }
> + .data.trailer : {
> + LONG(. - input_data + 8) payload_offset = .;
> + LONG(input_data_end - input_data) payload_length = .;
> + }
> }
> diff --git a/arch/x86/boot/compressed/vmlinux_64.lds b/arch/x86/boot/compressed/vmlinux_64.lds
> index f6e5b44..dcb9773 100644
> --- a/arch/x86/boot/compressed/vmlinux_64.lds
> +++ b/arch/x86/boot/compressed/vmlinux_64.lds
> @@ -45,4 +45,8 @@ SECTIONS
> . = . + 4096 * 6;
> _heap = .;
> }
> + .data.trailer : {
> + LONG(. - input_data + 8) payload_offset = .;
> + LONG(input_data_end - input_data) payload_length = .;
> + }
> }
>
>
View attachment "bzimage-loader.patch" of type "text/x-patch" (10561 bytes)
Powered by blists - more mailing lists