mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
x86/traps: Correct exc_general_protection() and math_error() return paths
Commit334872a091
("x86/traps: Attempt to fixup exceptions in vDSO before signaling") added return statements which bypass calling cond_local_irq_disable(). According toca4c6a9858
("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:334872a091
("x86/traps: Attempt to fixup exceptions in vDSO before signaling") Signed-off-by: Thomas Tai <thomas.tai@oracle.com> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com> Link: https://lkml.kernel.org/r/1617902914-83245-1-git-send-email-thomas.tai@oracle.com
This commit is contained in:
parent
3a62583c28
commit
632a1c209b
1 changed files with 2 additions and 2 deletions
|
@ -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)
|
||||||
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));
|
||||||
|
|
Loading…
Reference in a new issue