Commit 254eb550 authored Nov 30, 2018 by Kirill A. Shutemov Committed by Thomas Gleixner Dec 11, 2018

x86/dump_pagetables: Fix LDT remap address marker



The LDT remap placement has been changed. It's now placed before the direct
mapping in the kernel virtual address space for both paging modes.

Change address markers order accordingly.

Fixes: d52888aa ("x86/mm: Move LDT remap out of KASLR region on 5-level paging")
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: hpa@zytor.com
Cc: dave.hansen@linux.intel.com
Cc: luto@kernel.org
Cc: peterz@infradead.org
Cc: boris.ostrovsky@oracle.com
Cc: jgross@suse.com
Cc: bhe@redhat.com
Cc: hans.van.kranenburg@mendix.com
Cc: linux-mm@kvack.org
Cc: xen-devel@lists.xenproject.org
Link: https://lkml.kernel.org/r/20181130202328.65359-3-kirill.shutemov@linux.intel.com

parent 16877a55

arch/x86/mm/dump_pagetables.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -55,10 +55,10 @@ struct addr_marker {
		enum address_markers_idx {
		USER_SPACE_NR = 0,
		KERNEL_SPACE_NR,
		LOW_KERNEL_NR,
		#if defined(CONFIG_MODIFY_LDT_SYSCALL) && defined(CONFIG_X86_5LEVEL)
		#ifdef CONFIG_MODIFY_LDT_SYSCALL
		LDT_NR,
		#endif
		LOW_KERNEL_NR,
		VMALLOC_START_NR,
		VMEMMAP_START_NR,
		#ifdef CONFIG_KASAN
		@@ -66,9 +66,6 @@ enum address_markers_idx {
		KASAN_SHADOW_END_NR,
		#endif
		CPU_ENTRY_AREA_NR,
		#if defined(CONFIG_MODIFY_LDT_SYSCALL) && !defined(CONFIG_X86_5LEVEL)
		LDT_NR,
		#endif
		#ifdef CONFIG_X86_ESPFIX64
		ESPFIX_START_NR,
		#endif

Admin message