From 9d3bac49a54ffacd44d7fffda307b211d78b2ce0 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 19 Nov 2021 09:40:19 +0100 Subject: [PATCH] x86/traps: Fix typo in do_entry_CP() The call to debugger_trap_entry() should pass the correct vector. The break-for-gdbsx logic is in practice unreachable because PV guests can't generate #CP, but it will interfere with anyone inserting custom debugging into debugger_trap_entry(). Fixes: 5ad05b9c2490 ("x86/traps: Implement #CP handler and extend #PF for shadow stacks") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 512863ed238d7390f74d43f0ba298b1dfa8f4803 master date: 2021-11-03 19:13:17 +0000 --- xen/arch/x86/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index a38f10ad28..d8dd583a4a 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1975,7 +1975,7 @@ void do_entry_CP(struct cpu_user_regs *regs) const char *err = "??"; unsigned int ec = regs->error_code; - if ( debugger_trap_entry(TRAP_debug, regs) ) + if ( debugger_trap_entry(X86_EXC_CP, regs) ) return; /* Decode ec if possible */ -- 2.30.2