From 307cf4c4fd6d17d6cd27e04fb821d412e6471938 Mon Sep 17 00:00:00 2001 From: Volodymyr Babchuk Date: Tue, 10 Oct 2017 18:52:43 +0300 Subject: [PATCH] arm: traps: check if SMC was conditional before handling it Trapped SMC instruction can fail condition check on ARMv8 architecture (ARM DDI 0487B.a page D7-2271). So we need to check if condition was meet. Signed-off-by: Volodymyr Babchuk Reviewed-by: Julien Grall --- xen/arch/arm/traps.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index ace5a43322..5b91e6c340 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2199,6 +2199,12 @@ static void do_trap_smc(struct cpu_user_regs *regs, const union hsr hsr) { int rc = 0; + if ( !check_conditional_instr(regs, hsr) ) + { + advance_pc(regs, hsr); + return; + } + if ( current->domain->arch.monitor.privileged_call_enabled ) rc = monitor_smc(); -- 2.30.2