From: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> To: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Cc: "linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" <linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>, "Russell King" <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>, "Matt Fleming" <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>, "Leif Lindholm" <leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, "Andrew Lunn" <andrew-g2DYL2Zd6BY@public.gmane.org>, "Jason Cooper" <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>, "Sebastian Hesselbarth" <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, "Thomas Petazzoni" <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>, "Miquel RAYNAL" <miquel.raynal-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>, "Antoine Ténart" <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Subject: Re: [PATCH v2 5/7] arm: efi: split zImage code and data into separate PE/COFF sections Date: Fri, 8 Sep 2017 15:48:23 +0100 [thread overview] Message-ID: <CAKv+Gu8e49ZmB6X=H2vE_dw1HA3CyOq0GN7cZOYJ+JpkTftGWA@mail.gmail.com> (raw) In-Reply-To: <87mv65s1iu.fsf-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> On 8 September 2017 at 15:33, Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> wrote: > Hi Ard, > > On ven., sept. 08 2017, Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote: > >> On 8 September 2017 at 14:54, Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote: >>> On 8 September 2017 at 14:50, Gregory CLEMENT >>> <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> wrote: >>>> Hi Ard, >>>> >>>> On jeu., juin 29 2017, Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote: >>>> >>>>> To prevent unintended modifications to the kernel text (malicious or >>>>> otherwise) while running the EFI stub, describe the kernel image as >>>>> two separate sections: a .text section with read-execute permissions, >>>>> covering .text, .rodata, .piggytext and the GOT sections (which the >>>>> stub does not care about anyway), and a .data section with read-write >>>>> permissions, covering .data and .bss. >>>>> >>>>> This relies on the firmware to actually take the section permission >>>>> flags into account, but this is something that is currently being >>>>> implemented in EDK2, which means we will likely start seeing it in >>>>> the wild between one and two years from now. >>>> >>>> This patch had been merged in mainline yesterday and now prevent the >>>> Marvell Armada 370 and the Armada XP based SoC to boot. I also suspect >>>> that more Socs are impacted because the number of boot fail exploded >>>> according to kci: >>>> https://kernelci.org/boot/all/job/mainline/branch/master/kernel/v4.13-8899-g8dc5b3a6cb2f/ >>>> >>> >>> Ouch. >>> >>>> I found this patch after bisecting (I can provide the bisect log if >>>> needed). >>>> >>>> The kernel failed to boot only if CONFIG_EFI is enabled so it occurs in >>>> multi_v7_defconfig but not with mvebu_v7_defconfig. >>>> >>>> Currently the solution is to revert this patch. >>>> >>>> Have you a better option? >>>> >>> >>> I will investigate. >> >> I cannot reproduce this on QEMU or my Beaglebone white. I have tried a >> locally built zImage as well as the one built by kernelci. >> >> Could you please try whether this fixes things? It does not explain >> anything but it will help me figure out what is going on (hopefully) > > I've just tested this change and it didn't fix anything. > > Gregory > >> >> >> diff --git a/arch/arm/boot/compressed/efi-header.S >> b/arch/arm/boot/compressed/efi-header.S >> index c94a88ae834d..671a6e5b7b99 100644 >> --- a/arch/arm/boot/compressed/efi-header.S >> +++ b/arch/arm/boot/compressed/efi-header.S >> @@ -127,7 +127,7 @@ section_table: >> >> .set section_count, (. - section_table) / 40 >> >> - .align 12 >> + .align 9 >> __efi_start: >> #endif >> .endm > How about this? diff --git a/arch/arm/boot/compressed/vmlinux.lds.S b/arch/arm/boot/compressed/vmlinux.lds.S index 7a4c59154361..dfcc2baa0077 100644 --- a/arch/arm/boot/compressed/vmlinux.lds.S +++ b/arch/arm/boot/compressed/vmlinux.lds.S @@ -29,6 +29,11 @@ SECTIONS * of the text/got segments. */ *(.data) + /* + * C code that is shared with the kernel proper (but rebuilt for the + * decompressor) may contain exports that we have no use for here. + */ + *(*ksymtab* *kcrctab*) } . = TEXT_START;
WARNING: multiple messages have this Message-ID (diff)
From: ard.biesheuvel@linaro.org (Ard Biesheuvel) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 5/7] arm: efi: split zImage code and data into separate PE/COFF sections Date: Fri, 8 Sep 2017 15:48:23 +0100 [thread overview] Message-ID: <CAKv+Gu8e49ZmB6X=H2vE_dw1HA3CyOq0GN7cZOYJ+JpkTftGWA@mail.gmail.com> (raw) In-Reply-To: <87mv65s1iu.fsf@free-electrons.com> On 8 September 2017 at 15:33, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote: > Hi Ard, > > On ven., sept. 08 2017, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > >> On 8 September 2017 at 14:54, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: >>> On 8 September 2017 at 14:50, Gregory CLEMENT >>> <gregory.clement@free-electrons.com> wrote: >>>> Hi Ard, >>>> >>>> On jeu., juin 29 2017, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: >>>> >>>>> To prevent unintended modifications to the kernel text (malicious or >>>>> otherwise) while running the EFI stub, describe the kernel image as >>>>> two separate sections: a .text section with read-execute permissions, >>>>> covering .text, .rodata, .piggytext and the GOT sections (which the >>>>> stub does not care about anyway), and a .data section with read-write >>>>> permissions, covering .data and .bss. >>>>> >>>>> This relies on the firmware to actually take the section permission >>>>> flags into account, but this is something that is currently being >>>>> implemented in EDK2, which means we will likely start seeing it in >>>>> the wild between one and two years from now. >>>> >>>> This patch had been merged in mainline yesterday and now prevent the >>>> Marvell Armada 370 and the Armada XP based SoC to boot. I also suspect >>>> that more Socs are impacted because the number of boot fail exploded >>>> according to kci: >>>> https://kernelci.org/boot/all/job/mainline/branch/master/kernel/v4.13-8899-g8dc5b3a6cb2f/ >>>> >>> >>> Ouch. >>> >>>> I found this patch after bisecting (I can provide the bisect log if >>>> needed). >>>> >>>> The kernel failed to boot only if CONFIG_EFI is enabled so it occurs in >>>> multi_v7_defconfig but not with mvebu_v7_defconfig. >>>> >>>> Currently the solution is to revert this patch. >>>> >>>> Have you a better option? >>>> >>> >>> I will investigate. >> >> I cannot reproduce this on QEMU or my Beaglebone white. I have tried a >> locally built zImage as well as the one built by kernelci. >> >> Could you please try whether this fixes things? It does not explain >> anything but it will help me figure out what is going on (hopefully) > > I've just tested this change and it didn't fix anything. > > Gregory > >> >> >> diff --git a/arch/arm/boot/compressed/efi-header.S >> b/arch/arm/boot/compressed/efi-header.S >> index c94a88ae834d..671a6e5b7b99 100644 >> --- a/arch/arm/boot/compressed/efi-header.S >> +++ b/arch/arm/boot/compressed/efi-header.S >> @@ -127,7 +127,7 @@ section_table: >> >> .set section_count, (. - section_table) / 40 >> >> - .align 12 >> + .align 9 >> __efi_start: >> #endif >> .endm > How about this? diff --git a/arch/arm/boot/compressed/vmlinux.lds.S b/arch/arm/boot/compressed/vmlinux.lds.S index 7a4c59154361..dfcc2baa0077 100644 --- a/arch/arm/boot/compressed/vmlinux.lds.S +++ b/arch/arm/boot/compressed/vmlinux.lds.S @@ -29,6 +29,11 @@ SECTIONS * of the text/got segments. */ *(.data) + /* + * C code that is shared with the kernel proper (but rebuilt for the + * decompressor) may contain exports that we have no use for here. + */ + *(*ksymtab* *kcrctab*) } . = TEXT_START;
next prev parent reply other threads:[~2017-09-08 14:48 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-29 8:18 [PATCH v2 0/7] ARM: efi: PE/COFF cleanup/hardening Ard Biesheuvel 2017-06-29 8:18 ` Ard Biesheuvel [not found] ` <20170629081849.15081-1-ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-06-29 8:18 ` [PATCH v2 1/7] arm: efi: remove forbidden values from the PE/COFF header Ard Biesheuvel 2017-06-29 8:18 ` Ard Biesheuvel 2017-06-29 8:18 ` [PATCH v2 2/7] arm: efi: remove pointless dummy .reloc section Ard Biesheuvel 2017-06-29 8:18 ` Ard Biesheuvel 2017-06-29 8:18 ` [PATCH v2 3/7] arm: efi: replace open coded constants with symbolic ones Ard Biesheuvel 2017-06-29 8:18 ` Ard Biesheuvel 2017-06-29 8:18 ` [PATCH v2 4/7] arm: compressed: discard ksymtab/kcrctab sections Ard Biesheuvel 2017-06-29 8:18 ` Ard Biesheuvel 2017-06-29 8:18 ` [PATCH v2 5/7] arm: efi: split zImage code and data into separate PE/COFF sections Ard Biesheuvel 2017-06-29 8:18 ` Ard Biesheuvel [not found] ` <20170629081849.15081-6-ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-09-08 13:50 ` Gregory CLEMENT 2017-09-08 13:50 ` Gregory CLEMENT [not found] ` <87r2vhs3il.fsf-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2017-09-08 13:54 ` Ard Biesheuvel 2017-09-08 13:54 ` Ard Biesheuvel [not found] ` <CAKv+Gu9DVRE6jGEvdkfWwaJDhmTeaF2-CMi=JdFx3GS2Qqdy3A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2017-09-08 14:28 ` Ard Biesheuvel 2017-09-08 14:28 ` Ard Biesheuvel [not found] ` <CAKv+Gu9UF7-Dyjijvbc97yEF6zehQMyjOcV=RxFEJkNEebakUw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2017-09-08 14:33 ` Gregory CLEMENT 2017-09-08 14:33 ` Gregory CLEMENT [not found] ` <87mv65s1iu.fsf-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2017-09-08 14:48 ` Ard Biesheuvel [this message] 2017-09-08 14:48 ` Ard Biesheuvel [not found] ` <CAKv+Gu8e49ZmB6X=H2vE_dw1HA3CyOq0GN7cZOYJ+JpkTftGWA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2017-09-08 14:56 ` Gregory CLEMENT 2017-09-08 14:56 ` Gregory CLEMENT [not found] ` <87efrhs0gj.fsf-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2017-09-08 14:57 ` Ard Biesheuvel 2017-09-08 14:57 ` Ard Biesheuvel [not found] ` <CAKv+Gu8Aa7Y8SK2nJM2DXZzHbzZT6aq2Rt1wsgaLwz7_C3otJA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2017-09-08 15:11 ` Ard Biesheuvel 2017-09-08 15:11 ` Ard Biesheuvel [not found] ` <CAKv+Gu8hcT=_1iF4gaS==uGQWAb9-i0Y=XJ-MqgfQQyn1RmGtQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2017-09-08 15:17 ` Gregory CLEMENT 2017-09-08 15:17 ` Gregory CLEMENT [not found] ` <87a825rzio.fsf-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2017-09-08 15:18 ` Ard Biesheuvel 2017-09-08 15:18 ` Ard Biesheuvel 2017-06-29 8:18 ` [PATCH v2 6/7] arm: compressed: put zImage header and EFI header in dedicated section Ard Biesheuvel 2017-06-29 8:18 ` Ard Biesheuvel 2017-06-29 8:18 ` [PATCH v2 7/7] arm: efi: add PE/COFF debug table to EFI header Ard Biesheuvel 2017-06-29 8:18 ` Ard Biesheuvel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAKv+Gu8e49ZmB6X=H2vE_dw1HA3CyOq0GN7cZOYJ+JpkTftGWA@mail.gmail.com' \ --to=ard.biesheuvel-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \ --cc=andrew-g2DYL2Zd6BY@public.gmane.org \ --cc=antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ --cc=gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ --cc=jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org \ --cc=leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org \ --cc=miquel.raynal-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ --cc=sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.