On Thu, Jun 06, 2019 at 12:25:13PM +0200, Ard Biesheuvel wrote:
Commit 60f38de7a8d4e816100ceafd1b382df52527bd50 upstream. Merge the parsing of the command line carried out in arm-stub.c with the handling in efi_parse_options(). Note that this also fixes the missing handling of CONFIG_CMDLINE_FORCE=y, in which case the builtin command line should supersede the one passed by the firmware. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: bhe@xxxxxxxxxx Cc: bhsharma@xxxxxxxxxx Cc: bp@xxxxxxxxx Cc: eugene@xxxxxx Cc: evgeny.kalugin@xxxxxxxxx Cc: jhugo@xxxxxxxxxxxxxx Cc: leif.lindholm@xxxxxxxxxx Cc: linux-efi@xxxxxxxxxxxxxxx Cc: mark.rutland@xxxxxxx Cc: roy.franz@xxxxxxxxxx Cc: rruigrok@xxxxxxxxxxxxxx Link: http://lkml.kernel.org/r/20170404160910.28115-1-ard.biesheuvel@xxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> [ardb: fix up merge conflicts with 4.9.180] Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> --- This fixes the GCC build issue reported by Eike. Note that testing of arm64 stable kernels should cover CONFIG_RANDOMIZE_BASE, since it has a profound impact on how the kernel binary gets put together.
Should this fix be applied to 4.9 as well? I see it in 4.14+ -- Thanks, Sasha
