Commit 632a1c20 authored by Thomas Tai's avatar Thomas Tai Committed by Borislav Petkov

x86/traps: Correct exc_general_protection() and math_error() return paths

Commit

  334872a0 ("x86/traps: Attempt to fixup exceptions in vDSO before signaling")

added return statements which bypass calling cond_local_irq_disable().

According to

  ca4c6a98 ("x86/traps: Make interrupt enable/disable symmetric in C code"),

cond_local_irq_disable() is needed because the asm return code no longer
disables interrupts. Follow the existing code as an example to use "goto
exit" instead of "return" statement.

 [ bp: Massage commit message. ]

Fixes: 334872a0 ("x86/traps: Attempt to fixup exceptions in vDSO before signaling")
Signed-off-by: default avatarThomas Tai <thomas.tai@oracle.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarAlexandre Chartre <alexandre.chartre@oracle.com>
Link: https://lkml.kernel.org/r/1617902914-83245-1-git-send-email-thomas.tai@oracle.com
parent 3a62583c
...@@ -556,7 +556,7 @@ DEFINE_IDTENTRY_ERRORCODE(exc_general_protection) ...@@ -556,7 +556,7 @@ DEFINE_IDTENTRY_ERRORCODE(exc_general_protection)
tsk->thread.trap_nr = X86_TRAP_GP; tsk->thread.trap_nr = X86_TRAP_GP;
if (fixup_vdso_exception(regs, X86_TRAP_GP, error_code, 0)) if (fixup_vdso_exception(regs, X86_TRAP_GP, error_code, 0))
return; goto exit;
show_signal(tsk, SIGSEGV, "", desc, regs, error_code); show_signal(tsk, SIGSEGV, "", desc, regs, error_code);
force_sig(SIGSEGV); force_sig(SIGSEGV);
...@@ -1057,7 +1057,7 @@ static void math_error(struct pt_regs *regs, int trapnr) ...@@ -1057,7 +1057,7 @@ static void math_error(struct pt_regs *regs, int trapnr)
goto exit; goto exit;
if (fixup_vdso_exception(regs, trapnr, 0, 0)) if (fixup_vdso_exception(regs, trapnr, 0, 0))
return; goto exit;
force_sig_fault(SIGFPE, si_code, force_sig_fault(SIGFPE, si_code,
(void __user *)uprobe_get_trap_addr(regs)); (void __user *)uprobe_get_trap_addr(regs));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment