Commit 89401be6 authored Feb 03, 2019 by Linus Torvalds

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

Pull EFI fix from Thomas Gleixner:
 "The dump info for the efi page table debugging lacks a terminator
  which causes the kernel to crash when the debugfile is read"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/arm64: Fix debugfs crash by adding a terminator for ptdump marker

parents 312b3a93 74c953ca

drivers/firmware/efi/arm-runtime.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,8 @@ static struct ptdump_info efi_ptdump_info = {
		.mm = &efi_mm,
		.markers = (struct addr_marker[]){
		{ 0, "UEFI runtime start" },
		{ DEFAULT_MAP_WINDOW_64, "UEFI runtime end" }
		{ DEFAULT_MAP_WINDOW_64, "UEFI runtime end" },
		{ -1, NULL }
		},
		.base_addr = 0,
		};