Commit 2716da96 authored Aug 24, 2022 by James Morse Committed by Kishor Krishna Bhat Oct 14, 2022

arm64: entry.S: Add ventry overflow sanity checks



commit 4330e2c5c04c27bebf89d34e0bc14e6943413067 upstream.

Subsequent patches add even more code to the ventry slots.
Ensure kernels  that overflow ventry slot do not get built.

Change-Id: I93c5b565257efdddb704b2b477b6521c3440a334
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: e8bfe29a
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: Kishor Krishna Bhat <quic_kishkris@quicinc.com>

parent 67accca7

arch/arm64/kernel/entry.S

+3 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@

		.macro kernel_ventry, el, label, regsize = 64
		.align 7
		.Lventry_start\@:
		#ifdef CONFIG_UNMAP_KERNEL_AT_EL0
		alternative_if ARM64_UNMAP_KERNEL_AT_EL0
		.if \el == 0
		@@ -127,6 +128,7 @@ alternative_else_nop_endif
		mrs x0, tpidrro_el0
		#endif
		b el\()\el\()_\label
		.org .Lventry_start\@ + 128 // Did we overflow the ventry slot?
		.endm

		.macro tramp_alias, dst, sym
		@@ -1017,6 +1019,7 @@ alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003
		add x30, x30, #(1b - tramp_vectors)
		isb
		ret
		.org 1b + 128 // Did we overflow the ventry slot?
		.endm

		.macro tramp_exit, regsize = 64