Commit 0537c4cd authored by Dave Martin's avatar Dave Martin Committed by Catalin Marinas
Browse files

arm64: BTI: Reset BTYPE when skipping emulated instructions 



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: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarDave Martin <Dave.Martin@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent d2c2ee4c

arch/arm64/kernel/traps.c

+2 −0
Original line number Diff line number Diff line
@@ -340,6 +340,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);