public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: James Morse <james.morse@arm.com>
To: stable@vger.kernel.org
Cc: catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org,
	james.morse@arm.com
Subject: [stable:PATCH v5.4.184 05/22] arm64: entry.S: Add ventry overflow sanity checks
Date: Tue, 15 Mar 2022 18:23:58 +0000	[thread overview]
Message-ID: <20220315182415.3900464-6-james.morse@arm.com> (raw)
In-Reply-To: <20220315182415.3900464-1-james.morse@arm.com>

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: 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>
---
 arch/arm64/kernel/entry.S | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index db137746c6fa..98991aa9d0b1 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -59,6 +59,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
@@ -116,6 +117,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
@@ -1080,6 +1082,7 @@ alternative_else_nop_endif
 	add	x30, x30, #(1b - tramp_vectors)
 	isb
 	ret
+.org 1b + 128	// Did we overflow the ventry slot?
 	.endm
 
 	.macro tramp_exit, regsize = 64
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2022-03-15 18:26 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-15 18:23 [stable:PATCH v5.4.184 00/22] arm64: Mitigate spectre style branch history side channels James Morse
2022-03-15 18:23 ` [stable:PATCH v5.4.184 01/22] arm64: Add part number for Arm Cortex-A77 James Morse
2022-03-15 18:23 ` [stable:PATCH v5.4.184 02/22] arm64: Add Neoverse-N2, Cortex-A710 CPU part definition James Morse
2022-03-15 18:23 ` [stable:PATCH v5.4.184 03/22] arm64: add ID_AA64ISAR2_EL1 sys register James Morse
2022-03-15 18:23 ` [stable:PATCH v5.4.184 04/22] arm64: Add Cortex-X2 CPU part definition James Morse
2022-03-15 18:23 ` James Morse [this message]
2022-03-15 18:23 ` [stable:PATCH v5.4.184 06/22] arm64: entry: Make the trampoline cleanup optional James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 07/22] arm64: entry: Free up another register on kpti's tramp_exit path James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 08/22] arm64: entry: Move the trampoline data page before the text page James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 09/22] arm64: entry: Allow tramp_alias to access symbols after the 4K boundary James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 10/22] arm64: entry: Don't assume tramp_vectors is the start of the vectors James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 11/22] arm64: entry: Move trampoline macros out of ifdef'd section James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 12/22] arm64: entry: Make the kpti trampoline's kpti sequence optional James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 13/22] arm64: entry: Allow the trampoline text to occupy multiple pages James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 14/22] arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 15/22] arm64: entry: Add vectors that have the bhb mitigation sequences James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 16/22] arm64: entry: Add macro for reading symbol addresses from the trampoline James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 17/22] arm64: Add percpu vectors for EL1 James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 18/22] arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2 James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 19/22] KVM: arm64: Add templates for BHB mitigation sequences James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 20/22] arm64: Mitigate spectre style branch history side channels James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 21/22] KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated James Morse
2022-03-15 18:24 ` [stable:PATCH v5.4.184 22/22] arm64: Use the clearbhb instruction in mitigations James Morse
2022-03-16 15:41 ` [stable:PATCH v5.4.184 00/22] arm64: Mitigate spectre style branch history side channels Sasha Levin
2022-03-16 17:38   ` James Morse
2022-03-16 18:43     ` Sasha Levin
2022-03-17 10:00   ` Greg KH
2022-03-18 12:15     ` James Morse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220315182415.3900464-6-james.morse@arm.com \
    --to=james.morse@arm.com \
    --cc=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox