From f8c6a9334b251d2e78b0873a71b4d369908fb123 Mon Sep 17 00:00:00 2001 From: Wei Chen Date: Tue, 29 Nov 2016 15:59:26 +0100 Subject: [PATCH] arm: crash the guest when it traps on external abort If we spot a data or prefetch abort bearing the ESR_EL2.EA bit set, we know that this is an external abort, and that should crash the guest. This is part of XSA-201. Signed-off-by: Wei Chen Reviewed-by: Stefano Stabellini Reviewed-by: Steve Capper Reviewed-by: Julien Grall --- xen/arch/arm/traps.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 3bbd002370..8ff73fe5e1 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2409,6 +2409,15 @@ static void do_trap_instr_abort_guest(struct cpu_user_regs *regs, paddr_t gpa; mfn_t mfn; + /* + * If this bit has been set, it means that this instruction abort is caused + * by a guest external abort. Currently we crash the guest to protect the + * hypervisor. In future one can better handle this by injecting a virtual + * abort to the guest. + */ + if ( hsr.iabt.eat ) + domain_crash_synchronous(); + if ( hpfar_is_valid(hsr.iabt.s1ptw, fsc) ) gpa = get_faulting_ipa(gva); else @@ -2503,6 +2512,15 @@ static void do_trap_data_abort_guest(struct cpu_user_regs *regs, uint8_t fsc = hsr.dabt.dfsc & ~FSC_LL_MASK; mfn_t mfn; + /* + * If this bit has been set, it means that this data abort is caused + * by a guest external abort. Currently we crash the guest to protect the + * hypervisor. In future one can better handle this by injecting a virtual + * abort to the guest. + */ + if ( dabt.eat ) + domain_crash_synchronous(); + info.dabt = dabt; #ifdef CONFIG_ARM_32 info.gva = READ_CP32(HDFAR); -- 2.30.2