Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fix from Thomas Gleixner:
 "A single fix, which addresses boot failures on machines which do not
  report EBDA correctly, which can place the trampoline into reserved
  memory regions. Validating against E820 prevents that"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot/compressed/64: Validate trampoline placement against E820
parents 2f3672cb 1b3a6264

arch/x86/boot/compressed/pgtable_64.c

+55 −18
Original line number Original line Diff line number Diff line 
#include <asm/e820/types.h>

#include <asm/processor.h>

#include <asm/processor.h>

#include "pgtable.h"

#include "pgtable.h"

#include "../string.h"

#include "../string.h"
@@ -34,10 +35,62 @@ unsigned long *trampoline_32bit __section(.data); 
extern struct boot_params *boot_params;

extern struct boot_params *boot_params;

int cmdline_find_option_bool(const char *option);

int cmdline_find_option_bool(const char *option);





static unsigned long find_trampoline_placement(void)

{

	unsigned long bios_start, ebda_start;

	unsigned long trampoline_start;

	struct boot_e820_entry *entry;

	int i;



	/*

	 * Find a suitable spot for the trampoline.

	 * This code is based on reserve_bios_regions().

	 */



	ebda_start = *(unsigned short *)0x40e << 4;

	bios_start = *(unsigned short *)0x413 << 10;



	if (bios_start < BIOS_START_MIN || bios_start > BIOS_START_MAX)

		bios_start = BIOS_START_MAX;



	if (ebda_start > BIOS_START_MIN && ebda_start < bios_start)

		bios_start = ebda_start;



	bios_start = round_down(bios_start, PAGE_SIZE);



	/* Find the first usable memory region under bios_start. */

	for (i = boot_params->e820_entries - 1; i >= 0; i--) {

		entry = &boot_params->e820_table[i];



		/* Skip all entries above bios_start. */

		if (bios_start <= entry->addr)

			continue;



		/* Skip non-RAM entries. */

		if (entry->type != E820_TYPE_RAM)

			continue;



		/* Adjust bios_start to the end of the entry if needed. */

		if (bios_start > entry->addr + entry->size)

			bios_start = entry->addr + entry->size;



		/* Keep bios_start page-aligned. */

		bios_start = round_down(bios_start, PAGE_SIZE);



		/* Skip the entry if it's too small. */

		if (bios_start - TRAMPOLINE_32BIT_SIZE < entry->addr)

			continue;



		break;

	}



	/* Place the trampoline just below the end of low memory */

	return bios_start - TRAMPOLINE_32BIT_SIZE;

}



struct paging_config paging_prepare(void *rmode)

struct paging_config paging_prepare(void *rmode)

{

{

	struct paging_config paging_config = {};

	struct paging_config paging_config = {};

	unsigned long bios_start, ebda_start;





	/* Initialize boot_params. Required for cmdline_find_option_bool(). */

	/* Initialize boot_params. Required for cmdline_find_option_bool(). */

	boot_params = rmode;

	boot_params = rmode;
@@ -61,23 +114,7 @@ struct paging_config paging_prepare(void *rmode) 
		paging_config.l5_required = 1;

		paging_config.l5_required = 1;

	}

	}





	/*

	paging_config.trampoline_start = find_trampoline_placement();

	 * Find a suitable spot for the trampoline.

	 * This code is based on reserve_bios_regions().

	 */



	ebda_start = *(unsigned short *)0x40e << 4;

	bios_start = *(unsigned short *)0x413 << 10;



	if (bios_start < BIOS_START_MIN || bios_start > BIOS_START_MAX)

		bios_start = BIOS_START_MAX;



	if (ebda_start > BIOS_START_MIN && ebda_start < bios_start)

		bios_start = ebda_start;



	/* Place the trampoline just below the end of low memory, aligned to 4k */

	paging_config.trampoline_start = bios_start - TRAMPOLINE_32BIT_SIZE;

	paging_config.trampoline_start = round_down(paging_config.trampoline_start, PAGE_SIZE);





	trampoline_32bit = (unsigned long *)paging_config.trampoline_start;

	trampoline_32bit = (unsigned long *)paging_config.trampoline_start;