Hi Mathieu,
On Sun, Jun 24, 2018 at 12:25:13PM -0400, Mathieu Desnoyers wrote:
> The prototype of rseq_handle_notify_resume() and rseq_signal_deliver()
> had to be changed to fix handling of traps occuring on signal delivery.
> The API change was merged at the same time as the rseq MIPS port.
>
> Adapt the MIPS port to this API change.
Ah, you beat me to send this out :)
Pushed to mips-fixes.
Thanks,
Paul
> Fixes: 784e0300fe ("rseq: Avoid infinite recursion when delivering SIGSEGV")
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
> Cc: Will Deacon <will.deacon@xxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
> Cc: peterz@xxxxxxxxxxxxx
> Cc: paulmck@xxxxxxxxxxxxxxxxxx
> Cc: boqun.feng@xxxxxxxxx
> Cc: linux-mips@xxxxxxxxxxxxxx
> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
> Cc: Paul Burton <paul.burton@xxxxxxxx>
> Cc: James Hogan <jhogan@xxxxxxxxxx>
> ---
> 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 00f2535d2226..0a9cfe7a0372 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.11.0
>
