Re: [PATCH] mips: rseq: Use new interface required to avoid SIGSEGV infinite recursion

[Dengcheng Zhu <dzhu@xxxxxxxxxxxx>]

Right after sending out this patch, I found Mathieu Desnoyers had already done it. Sorry for duplicating.


Dengcheng


From: Dengcheng Zhu
Sent: Monday, June 25, 2018 10:56 AM
To: Paul Burton; ralf@xxxxxxxxxxxxxx
Cc: linux-mips@xxxxxxxxxxxxxx; Dengcheng Zhu; Will Deacon
Subject: [PATCH] mips: rseq: Use new interface required to avoid SIGSEGV infinite recursion
  

The new interface was introduced in 784e0300fe (rseq: Avoid infinite
recursion when delivering SIGSEGV).

This patch makes the change for mips.

Signed-off-by: Dengcheng Zhu <dzhu@xxxxxxxxxxxx>
Cc: Will Deacon <will.deacon@xxxxxxx>
---
 arch/mips/kernel/signal.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 00f2535..0a9cfe7 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -801,7 +801,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
                 regs->regs[0] = 0;              /* Don't deal with this again.  */
         }
 
-       rseq_signal_deliver(regs);
+       rseq_signal_deliver(ksig, regs);
 
         if (sig_uses_siginfo(&ksig->ka, abi))
                 ret = abi->setup_rt_frame(vdso + abi->vdso->off_rt_sigreturn,
@@ -870,7 +870,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, void *unused,
         if (thread_info_flags & _TIF_NOTIFY_RESUME) {
                 clear_thread_flag(TIF_NOTIFY_RESUME);
                 tracehook_notify_resume(regs);
-               rseq_handle_notify_resume(regs);
+               rseq_handle_notify_resume(NULL, regs);
         }
 
         user_enter();
-- 
2.7.4