]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
x86/mm/pti: Do not invoke PTI functions when PTI is disabled
authorThomas Gleixner <tglx@linutronix.de>
Wed, 28 Aug 2019 14:24:47 +0000 (16:24 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Oct 2019 11:13:50 +0000 (13:13 +0200)
commitc9e116d055f93222791ec8b80b73b8efa6a04865
tree47c08b437b56813c9792e2273abe522ddaa1b7e7
parent6e46d1f164730d3288d2b09660aa8a2d147106d0
x86/mm/pti: Do not invoke PTI functions when PTI is disabled

[ Upstream commit 990784b57731192b7d90c8d4049e6318d81e887d ]

When PTI is disabled at boot time either because the CPU is not affected or
PTI has been disabled on the command line, the boot code still calls into
pti_finalize() which then unconditionally invokes:

     pti_clone_entry_text()
     pti_clone_kernel_text()

pti_clone_kernel_text() was called unconditionally before the 32bit support
was added and 32bit added the call to pti_clone_entry_text().

The call has no side effects as cloning the page tables into the available
second one, which was allocated for PTI does not create damage. But it does
not make sense either and in case that this functionality would be extended
later this might actually lead to hard to diagnose issues.

Neither function should be called when PTI is runtime disabled. Make the
invocation conditional.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190828143124.063353972@linutronix.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/mm/pti.c