Commit e8ffcd3a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v5.16_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:

 - Prevent potential undefined behavior due to shifting pkey constants
   into the sign bit

 - Move the EFI memory reservation code *after* the efi= cmdline parsing
   has happened

 - Revert two commits which turned out to be the wrong direction to
   chase when accommodating early memblock reservations consolidation
   and command line parameters parsing

* tag 'x86_urgent_for_v5.16_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/pkey: Fix undefined behaviour with PKRU_WD_BIT
  x86/boot: Move EFI range reservation after cmdline parsing
  Revert "x86/boot: Pull up cmdline preparation and early param parsing"
  Revert "x86/boot: Mark prepare_command_line() __init"
parents 2afa90bd 57690554

arch/x86/include/asm/pkru.h

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


#include <asm/cpufeature.h>



#define PKRU_AD_BIT 0x1

#define PKRU_WD_BIT 0x2

#define PKRU_AD_BIT 0x1u

#define PKRU_WD_BIT 0x2u

#define PKRU_BITS_PER_PKEY 2



#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS

arch/x86/kernel/setup.c

+30 −42
Original line number Diff line number Diff line
@@ -713,9 +713,6 @@ static void __init early_reserve_memory(void) 


	early_reserve_initrd();



	if (efi_enabled(EFI_BOOT))

		efi_memblock_x86_reserve_range();



	memblock_x86_reserve_range_setup_data();



	reserve_ibft_region();
@@ -742,28 +739,6 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p) 
	return 0;

}



static char * __init prepare_command_line(void)

{

#ifdef CONFIG_CMDLINE_BOOL

#ifdef CONFIG_CMDLINE_OVERRIDE

	strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);

#else

	if (builtin_cmdline[0]) {

		/* append boot loader cmdline to builtin */

		strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE);

		strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);

		strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);

	}

#endif

#endif



	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);



	parse_early_param();



	return command_line;

}



/*

 * Determine if we were loaded by an EFI loader.  If so, then we have also been

 * passed the efi memmap, systab, etc., so we should use these data structures
@@ -852,23 +827,6 @@ void __init setup_arch(char **cmdline_p) 


	x86_init.oem.arch_setup();



	/*

	 * x86_configure_nx() is called before parse_early_param() (called by

	 * prepare_command_line()) to detect whether hardware doesn't support

	 * NX (so that the early EHCI debug console setup can safely call

	 * set_fixmap()). It may then be called again from within noexec_setup()

	 * during parsing early parameters to honor the respective command line

	 * option.

	 */

	x86_configure_nx();



	/*

	 * This parses early params and it needs to run before

	 * early_reserve_memory() because latter relies on such settings

	 * supplied as early params.

	 */

	*cmdline_p = prepare_command_line();



	/*

	 * Do some memory reservations *before* memory is added to memblock, so

	 * memblock allocations won't overwrite it.
@@ -902,6 +860,36 @@ void __init setup_arch(char **cmdline_p) 
	bss_resource.start = __pa_symbol(__bss_start);

	bss_resource.end = __pa_symbol(__bss_stop)-1;



#ifdef CONFIG_CMDLINE_BOOL

#ifdef CONFIG_CMDLINE_OVERRIDE

	strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);

#else

	if (builtin_cmdline[0]) {

		/* append boot loader cmdline to builtin */

		strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE);

		strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);

		strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);

	}

#endif

#endif



	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);

	*cmdline_p = command_line;



	/*

	 * x86_configure_nx() is called before parse_early_param() to detect

	 * whether hardware doesn't support NX (so that the early EHCI debug

	 * console setup can safely call set_fixmap()). It may then be called

	 * again from within noexec_setup() during parsing early parameters

	 * to honor the respective command line option.

	 */

	x86_configure_nx();



	parse_early_param();



	if (efi_enabled(EFI_BOOT))

		efi_memblock_x86_reserve_range();



#ifdef CONFIG_MEMORY_HOTPLUG

	/*

	 * Memory used by the kernel cannot be hot-removed because Linux