From 442f95981e69df6eae0ac9c67d4932219c556e10 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 24 Jul 2014 17:21:15 +0100 Subject: [PATCH] xen: arm: Correctly handle do_sysreg exception injection from 64-bit userspace The do_sysreg case was missing a return, so it would increment PC and inject the trap to the second instruction of the handler. (This patch needs to be applied on top of xsa102-unstable-02.patch.) This is XSA-103. Signed-off-by: Ian Campbell Signed-off-by: Ian Jackson Acked-by: Julien Grall --- xen/arch/arm/traps.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index c89421b..ce325b5 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1704,6 +1704,7 @@ static void do_sysreg(struct cpu_user_regs *regs, hsr.bits & HSR_SYSREG_REGS_MASK); #endif inject_undef_exception(regs, sysreg.len); + return; } } -- 1.7.10.4