Junichi Nomura c5699cc857 x86/boot: Use efi_setup_data for searching RSDP on kexec-ed kernels ...

commit 0a23ebc66a upstream.

Commit

  3a63f70bf4 ("x86/boot: Early parse RSDP and save it in boot_params")

broke kexec boot on EFI systems. efi_get_rsdp_addr() in the early
parsing code tries to search RSDP from the EFI tables but that will
crash because the table address is virtual when the kernel was booted by
kexec (set_virtual_address_map() has run in the first kernel and cannot
be run again in the second kernel).

In the case of kexec, the physical address of EFI tables is provided via
efi_setup_data in boot_params, which is set up by kexec(1).

Factor out the table parsing code and use different pointers depending
on whether the kernel is booted by kexec or not.

 [ bp: Massage. ]

Fixes: 3a63f70bf4 ("x86/boot: Early parse RSDP and save it in boot_params")
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Tested-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Cc: Chao Fan <fanc.fnst@cn.fujitsu.com>
Cc: Dave Young <dyoung@redhat.com>
Link: https://lkml.kernel.org/r/20190408231011.GA5402@jeru.linux.bs1.fc.nec.co.jp
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2019-09-19 09:11:01 +02:00

..

compressed

x86/boot: Use efi_setup_data for searching RSDP on kexec-ed kernels

2019-09-19 09:11:01 +02:00

tools

x86/boot: Add missing va_end() to die()

2018-11-28 20:06:07 +01:00

.gitignore

x86/build: Add more generated files to the .gitignore file

2017-11-07 11:22:21 +01:00

a20.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

apm.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

bioscall.S

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 83

2019-05-24 17:37:52 +02:00

bitops.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

boot.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

cmdline.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

code16gcc.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

copy.S

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

cpu.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

cpucheck.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

cpuflags.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

cpuflags.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

ctype.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

early_serial_console.c

x86: Clean up 'sizeof x' => 'sizeof(x)'

2018-10-29 07:13:28 +01:00

edd.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

genimage.sh

x86/build: Make isoimage work on Debian

2017-12-16 16:23:31 +01:00

header.S

x86/boot: Mostly revert commit ae7e1238e6 ("Add ACPI RSDP address to setup_header")

2018-11-20 09:43:10 +01:00

install.sh

kbuild: use INSTALLKERNEL to select customized installkernel script

2009-09-20 12:18:14 +02:00

main.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

Makefile

x86/build: Specify elf_i386 linker emulation explicitly for i386 objects

2019-01-12 00:11:39 +01:00

memory.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

mkcpustr.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 83

2019-05-24 17:37:52 +02:00

mtools.conf.in

i386: move boot

2007-10-11 11:16:45 +02:00

pm.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

pmjump.S

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

printf.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

regs.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 83

2019-05-24 17:37:52 +02:00

setup.ld

x86/build: Use the single-argument OUTPUT_FORMAT() linker script command

2019-01-16 12:21:53 +01:00

string.c

x86/purgatory: Do not use __builtin_memcpy and __builtin_memset

2019-08-16 10:10:55 +02:00

string.h

x86/boot: Copy kstrtoull() to boot/string.c

2019-02-01 11:52:54 +01:00

tty.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

version.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

vesa.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 48

2019-05-24 17:27:13 +02:00

video-bios.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

video-mode.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

video-vesa.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

video-vga.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

video.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00

video.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497

2019-06-19 17:09:53 +02:00