From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 28 Sep 2021 20:55:56 +0000 (+0100)
Subject: x86/traps: Fix typo in do_entry_CP()
X-Git-Tag: 4.16.0-rc2~7
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=512863ed238d7390f74d43f0ba298b1dfa8f4803;p=xen.git

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 <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Release-Acked-by: Ian Jackson <iwj@xenproject.org>
---

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 79fd276a41..d483aa91f2 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -2134,7 +2134,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 */