From: Al Viro Date: Thu, 3 May 2012 01:45:12 +0000 (-0400) Subject: MIPS: Prevent hitting do_notify_resume() with !user_mode(regs). X-Git-Tag: next-20120927~111^2^2~3 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cfc1e9d6d2fbc06551f81200ac718ca201a34203;p=karo-tx-linux.git MIPS: Prevent hitting do_notify_resume() with !user_mode(regs). Too late to do anything there... Signed-off-by: Al Viro Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S index 37acfa036d44..4b0937f19862 100644 --- a/arch/mips/kernel/entry.S +++ b/arch/mips/kernel/entry.S @@ -167,6 +167,9 @@ work_notifysig: # deal with pending signals and FEXPORT(syscall_exit_work_partial) SAVE_STATIC syscall_exit_work: + LONG_L t0, PT_STATUS(sp) # returning to kernel mode? + andi t0, t0, KU_USER + beqz t0, resume_kernel li t0, _TIF_WORK_SYSCALL_EXIT and t0, a2 # a2 is preloaded with TI_FLAGS beqz t0, work_pending # trace bit set? diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index f2c09cfc60ac..0e1a5b8ae817 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c @@ -560,14 +560,6 @@ static void do_signal(struct pt_regs *regs) siginfo_t info; int signr; - /* - * We want the common case to go fast, which is why we may in certain - * cases get here from kernel mode. Just return without doing anything - * if so. - */ - if (!user_mode(regs)) - return; - signr = get_signal_to_deliver(&info, &ka, regs, NULL); if (signr > 0) { /* Whee! Actually deliver the signal. */