From: Marc Rittinghaus <marc.rittinghaus@kit.edu>
Date: Mon, 14 Jun 2021 09:47:16 +0000 (+0200)
Subject: plat/common/x86: Fix control protection trap
X-Git-Tag: RELEASE-0.6~181
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=612e93259a57bd6d83d4819a1f0099b68542bbf7;p=unikraft%2Funikraft.git

plat/common/x86: Fix control protection trap

The current trap number for the control protection exception (in
Unikraft called security trap) is wrong and the asm trap is missing. This
patch fixes these issues.

Signed-off-by: Marc Rittinghaus <marc.rittinghaus@kit.edu>
Reviewed-by: Simon Kuenzer <simon.kuenzer@neclab.eu>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Pull-Request: #228
---

diff --git a/plat/common/include/x86/traps.h b/plat/common/include/x86/traps.h
index 9fd9a4920..1ac680b51 100644
--- a/plat/common/include/x86/traps.h
+++ b/plat/common/include/x86/traps.h
@@ -55,7 +55,7 @@
 #define TRAP_machine_check       18
 #define TRAP_simd_error          19
 #define TRAP_virt_error          20
-#define TRAP_security_error      30
+#define TRAP_security_error      21
 
 #define ASM_TRAP_SYM(trapname)   asm_trap_##trapname
 
@@ -87,7 +87,7 @@ DECLARE_ASM_TRAP(alignment_check);
 DECLARE_ASM_TRAP(machine_check);
 DECLARE_ASM_TRAP(simd_error);
 DECLARE_ASM_TRAP(virt_error);
-
+DECLARE_ASM_TRAP(security_error);
 
 void do_unhandled_trap(int trapnr, char *str, struct __regs *regs,
 		unsigned long error_code);