Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8bfe29a authored by James Morse's avatar James Morse Committed by Greg Kroah-Hartman
Browse files

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 a ventry slot don't get built.

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>
parent 3482cafa

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
@@ -984,6 +986,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