From d3b3e8fb5f8983b3cafc460c3804b1366e6d0f68 Mon Sep 17 00:00:00 2001 From: Kris Van Hees Date: Fri, 24 Feb 2017 18:40:40 -0500 Subject: [PATCH] dtrace: enable paranoid mode and IST shift for xen_int3 The Xen PVM path into an INT3 trap was not using paranoid=1 mode nor was it using an IST shift as is done for HW INT3 traps. This interferes with the instruction emulation code check based on the handler return value. Orabug: 25580519 Signed-off-by: Kris Van Hees Acked-by: Konrad Rzeszutek Wilk --- arch/x86/kernel/entry_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index e922d1bd3970..3e39f75ef7c7 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1403,7 +1403,7 @@ idtentry int3 do_int3 has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK idtentry stack_segment do_stack_segment has_error_code=1 #ifdef CONFIG_XEN idtentry xen_debug do_debug has_error_code=0 -idtentry xen_int3 do_int3 has_error_code=0 +idtentry xen_int3 do_int3 has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK idtentry xen_stack_segment do_stack_segment has_error_code=1 #endif idtentry general_protection do_general_protection has_error_code=1 -- 2.51.0