From: Mark Brown <broonie@kernel•org>
To: Catalin Marinas <catalin.marinas@arm•com>, Will Deacon <will@kernel•org>
Cc: "Paul Elliott" <paul.elliott@arm•com>,
"Peter Zijlstra" <peterz@infradead•org>,
"Andrew Jones" <drjones@redhat•com>,
"Amit Kachhap" <amit.kachhap@arm•com>,
"Vincenzo Frascino" <vincenzo.frascino@arm•com>,
linux-arch@vger•kernel.org, "Marc Zyngier" <maz@kernel•org>,
"Eugene Syromiatnikov" <esyr@redhat•com>,
"Szabolcs Nagy" <szabolcs.nagy@arm•com>,
"Dave Martin" <Dave.Martin@arm•com>,
"H . J . Lu " <hjl.tools@gmail•com>,
"Yu-cheng Yu" <yu-cheng.yu@intel•com>,
"Kees Cook" <keescook@chromium•org>,
"Arnd Bergmann" <arnd@arndb•de>, "Jann Horn" <jannh@google•com>,
"Richard Henderson" <richard.henderson@linaro•org>,
"Kristina Martšenko" <kristina.martsenko@arm•com>,
"Mark Brown" <broonie@kernel•org>,
"Alexander Viro" <viro@zeniv•linux.org.uk>,
"Thomas Gleixner" <tglx@linutronix•de>,
linux-arm-kernel@lists•infradead.org,
"Florian Weimer" <fweimer@redhat•com>,
linux-kernel@vger•kernel.org, linux-fsdevel@vger•kernel.org,
"Sudakshina Das" <sudi.das@arm•com>
Subject: [PATCH v9 09/13] arm64: BTI: Reset BTYPE when skipping emulated instructions
Date: Wed, 11 Mar 2020 19:26:04 +0000 [thread overview]
Message-ID: <20200311192608.40095-10-broonie@kernel.org> (raw)
In-Reply-To: <20200311192608.40095-1-broonie@kernel.org>
From: Dave Martin <Dave.Martin@arm•com>
Since normal execution of any non-branch instruction resets the
PSTATE BTYPE field to 0, so do the same thing when emulating a
trapped instruction.
Branches don't trap directly, so we should never need to assign a
non-zero value to BTYPE here.
Signed-off-by: Dave Martin <Dave.Martin@arm•com>
Signed-off-by: Mark Brown <broonie@kernel•org>
---
arch/arm64/kernel/traps.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 3c07a7074145..52ed261e7739 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -335,6 +335,8 @@ void arm64_skip_faulting_instruction(struct pt_regs *regs, unsigned long size)
if (compat_user_mode(regs))
advance_itstate(regs);
+ else
+ regs->pstate &= ~PSR_BTYPE_MASK;
}
static LIST_HEAD(undef_hook);
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-03-11 19:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 19:25 [PATCH v9 00/13] arm64: Branch Target Identification support Mark Brown
2020-03-11 19:25 ` [PATCH v9 01/13] ELF: UAPI and Kconfig additions for ELF program properties Mark Brown
2020-03-11 19:25 ` [PATCH v9 02/13] ELF: Add ELF program property parsing support Mark Brown
2020-03-12 23:59 ` Kees Cook
2020-03-13 11:55 ` Mark Brown
2020-03-11 19:25 ` [PATCH v9 03/13] arm64: Basic Branch Target Identification support Mark Brown
2020-03-11 19:25 ` [PATCH v9 04/13] elf: Allow arch to tweak initial mmap prot flags Mark Brown
2020-03-11 19:26 ` [PATCH v9 05/13] arm64: elf: Enable BTI at exec based on ELF program properties Mark Brown
2020-03-11 19:26 ` [PATCH v9 06/13] arm64: BTI: Decode BYTPE bits when printing PSTATE Mark Brown
2020-03-11 19:26 ` [PATCH v9 07/13] arm64: unify native/compat instruction skipping Mark Brown
2020-03-11 19:26 ` [PATCH v9 08/13] arm64: traps: Shuffle code to eliminate forward declarations Mark Brown
2020-03-14 11:18 ` Catalin Marinas
2020-03-11 19:26 ` Mark Brown [this message]
2020-03-11 19:26 ` [PATCH v9 10/13] KVM: arm64: BTI: Reset BTYPE when skipping emulated instructions Mark Brown
2020-03-11 19:26 ` [PATCH v9 11/13] arm64: mm: Display guarded pages in ptdump Mark Brown
2020-03-11 19:26 ` [PATCH v9 12/13] mm: smaps: Report arm64 guarded pages in smaps Mark Brown
2020-03-13 0:00 ` Kees Cook
2020-03-11 19:26 ` [PATCH v9 13/13] arm64: BTI: Add Kconfig entry for userspace BTI Mark Brown
2020-03-13 0:01 ` Kees Cook
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=20200311192608.40095-10-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=Dave.Martin@arm$(echo .)com \
--cc=amit.kachhap@arm$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=catalin.marinas@arm$(echo .)com \
--cc=drjones@redhat$(echo .)com \
--cc=esyr@redhat$(echo .)com \
--cc=fweimer@redhat$(echo .)com \
--cc=hjl.tools@gmail$(echo .)com \
--cc=jannh@google$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=kristina.martsenko@arm$(echo .)com \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-fsdevel@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
--cc=paul.elliott@arm$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=richard.henderson@linaro$(echo .)org \
--cc=sudi.das@arm$(echo .)com \
--cc=szabolcs.nagy@arm$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=vincenzo.frascino@arm$(echo .)com \
--cc=viro@zeniv$(echo .)linux.org.uk \
--cc=will@kernel$(echo .)org \
--cc=yu-cheng.yu@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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