Commit 24dd997e authored by James Morse's avatar James Morse Committed by Zheng Zengkai
Browse files

arm64: entry: Make the trampoline cleanup optional 

stable inclusion
from stable-v5.10.105
commit 5242d6971e106be115d9dace9c1441f4a2e1cb25
category: bugfix
bugzilla: 186460 https://gitee.com/src-openeuler/kernel/issues/I53MHA
CVE: CVE-2022-23960

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5242d6971e10



--------------------------------

commit d739da16 upstream.

Subsequent patches will add additional sets of vectors that use
the same tricks as the kpti vectors to reach the full-fat vectors.
The full-fat vectors contain some cleanup for kpti that is patched
in by alternatives when kpti is in use. Once there are additional
vectors, the cleanup will be needed in more cases.

But on big/little systems, the cleanup would be harmful if no
trampoline vector were in use. Instead of forcing CPUs that don't
need a trampoline vector to use one, make the trampoline cleanup
optional.

Entry at the top of the vectors will skip the cleanup. The trampoline
vectors can then skip the first instruction, triggering the cleanup
to run.

Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarChen Jiahao <chenjiahao16@huawei.com>
Reviewed-by: default avatarLiao Chang <liaochang1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 5e6bef08

arch/arm64/kernel/entry.S

+7 −3
Original line number Diff line number Diff line
@@ -65,14 +65,18 @@ 
.Lventry_start\@:

#ifdef CONFIG_UNMAP_KERNEL_AT_EL0

	.if	\el == 0

alternative_if ARM64_UNMAP_KERNEL_AT_EL0

	/*

	 * This must be the first instruction of the EL0 vector entries. It is

	 * skipped by the trampoline vectors, to trigger the cleanup.

	 */

	b	.Lskip_tramp_vectors_cleanup\@

	.if	\regsize == 64

	mrs	x30, tpidrro_el0

	msr	tpidrro_el0, xzr

	.else

	mov	x30, xzr

	.endif

alternative_else_nop_endif

.Lskip_tramp_vectors_cleanup\@:

	.endif

#endif
@@ -819,7 +823,7 @@ alternative_if_not ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM 
	prfm	plil1strm, [x30, #(1b - tramp_vectors)]

alternative_else_nop_endif

	msr	vbar_el1, x30

	add	x30, x30, #(1b - tramp_vectors)

	add	x30, x30, #(1b - tramp_vectors + 4)

	isb

	ret

.org 1b + 128	// Did we overflow the ventry slot?