rseq: Avoid infinite recursion when delivering SIGSEGV
Subsystems (6)
PATCH v3 1/1 rseq: Avoid infinite recursion when delivering SIGSEGV
When delivering a signal to a task that is using rseq, we call into __rseq_handle_notify_resume() so that the registers pushed in the sigframe are updated to reflect the state of the restartable sequence (for example, ensuring that the signal returns to the abort handler if necessary).
However, if the rseq management fails due to an unrecoverable fault when accessing userspace or certain combinations of RSEQ_CS_* flags, then we will attempt to deliver a SIGSEGV. This has the potential for infinite recursion if the rseq code continuously fails on signal delivery.
Avoid this problem by using force_sigsegv() instead of force_sig(), which is explicitly designed to reset the SEGV handler to SIG_DFL in the case of a recursive fault. In doing so, remove rseq_signal_deliver() from the internal rseq API and have an optional struct ksignal * parameter to rseq_handle_notify_resume() instead.
---
v2 -> v3: Reintroduce rseq_signal_deliver()
arch/arm/kernel/signal.c | 4 ++-- arch/powerpc/kernel/signal.c | 4 ++-- arch/x86/entry/common.c | 2 +- arch/x86/kernel/signal.c | 2 +- include/linux/sched.h | 18 +++++++++++------- kernel/rseq.c | 7 ++++--- 6 files changed, 21 insertions(+), 16 deletions(-)
arch/arm/kernel/signal.c +2 -2
@@ -544,7 +544,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)* Increment event counter and perform fixup for the pre-signal * frame. */ -rseq_signal_deliver (regs); +rseq_signal_deliver (ksig, regs);/* * Set up the stack frame
@@ -666,7 +666,7 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) }else {clear_thread_flag (TIF_NOTIFY_RESUME );tracehook_notify_resume (regs); -rseq_handle_notify_resume (regs); +rseq_handle_notify_resume (NULL , regs); } }local_irq_disable ();
arch/powerpc/kernel/signal.c +2 -2
@@ -134,7 +134,7 @@ static void do_signal(struct task_struct *tsk)/* Re-enable the breakpoints for the signal stack */ thread_change_pc (tsk, tsk->thread.regs); -rseq_signal_deliver (tsk->thread.regs); +rseq_signal_deliver (&ksig, tsk->thread.regs);if (is32) {if (ksig.ka.sa.sa_flags &SA_SIGINFO )
@@ -170,7 +170,7 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)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 ();
arch/x86/entry/common.c +1 -1
@@ -164,7 +164,7 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)if (cached_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); }if (cached_flags & _TIF_USER_RETURN_NOTIFY)
arch/x86/kernel/signal.c +1 -1
@@ -692,7 +692,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)* Increment event counter and perform fixup for the pre-signal * frame. */ -rseq_signal_deliver (regs); +rseq_signal_deliver (ksig, regs);/* Set up the stack frame */ if (is_ia32_frame (ksig)) {
include/linux/sched.h +11 -7
@@ -1799,20 +1799,22 @@ static inline void rseq_set_notify_resume(struct task_struct *t)set_tsk_thread_flag (t,TIF_NOTIFY_RESUME ); } -void __rseq_handle_notify_resume (struct pt_regs *regs); +void __rseq_handle_notify_resume (struct ksignal *sig,struct pt_regs *regs); -static inline void rseq_handle_notify_resume (struct pt_regs *regs) +static inline void rseq_handle_notify_resume (struct ksignal *ksig, +struct pt_regs *regs) {if (current->rseq) -__rseq_handle_notify_resume (regs); +__rseq_handle_notify_resume (ksig, regs); } -static inline void rseq_signal_deliver (struct pt_regs *regs) +static inline void rseq_signal_deliver (struct ksignal *ksig, +struct pt_regs *regs) {preempt_disable ();__set_bit (RSEQ_EVENT_SIGNAL_BIT , ¤t->rseq_event_mask);preempt_enable (); -rseq_handle_notify_resume (regs); +rseq_handle_notify_resume (ksig, regs); }/* rseq_preempt() requires preemption to be disabled. */
@@ -1864,10 +1866,12 @@ static inline void rseq_execve(struct task_struct *t)static inline void rseq_set_notify_resume (struct task_struct *t) { } -static inline void rseq_handle_notify_resume (struct pt_regs *regs) +static inline void rseq_handle_notify_resume (struct ksignal *ksig, +struct pt_regs *regs) { } -static inline void rseq_signal_deliver (struct pt_regs *regs) +static inline void rseq_signal_deliver (struct ksignal *ksig, +struct pt_regs *regs) { }static inline void rseq_preempt (struct task_struct *t)
kernel/rseq.c +4 -3
@@ -251,10 +251,10 @@ static int rseq_ip_fixup(struct pt_regs *regs)* respect to other threads scheduled on the same CPU, and with respect * to signal handlers. */ -void __rseq_handle_notify_resume (struct pt_regs *regs) +void __rseq_handle_notify_resume (struct ksignal *ksig,struct pt_regs *regs) {struct task_struct *t = current; -int ret; +int ret, sig;if (unlikely (t->flags &PF_EXITING ))return ;
@@ -268,7 +268,8 @@ void __rseq_handle_notify_resume(struct pt_regs *regs)return ; error: -force_sig (SIGSEGV , t); + sig = ksig ? ksig->sig :0 ; +force_sigsegv (sig, t); }#ifdef CONFIG_DEBUG_RSEQ
Signature · 1 line
2.1.4
Quoted 11 lines · ----- On Jun 22, 2018, at 6:45 AM, Will Deacon [email protected] wrote:
When delivering a signal to a task that is using rseq, we call into
__rseq_handle_notify_resume()so that the registers pushed in the sigframe are updated to reflect the state of the restartable sequence (for example, ensuring that the signal returns to the abort handler if necessary).However, if the rseq management fails due to an unrecoverable fault when accessing userspace or certain combinations of RSEQ_CS_* flags, then we will attempt to deliver a SIGSEGV. This has the potential for infinite recursion if the rseq code continuously fails on signal delivery.
Quoted 7 lines
Avoid this problem by using
force_sigsegv()instead offorce_sig(), which is explicitly designed to reset the SEGV handler toSIG_DFLin the case of a recursive fault. In doing so, removerseq_signal_deliver()from the internal rseq API and have an optional struct ksignal * parameter torseq_handle_notify_resume()instead.Signed-off-by Will Deacon <[email protected]>
Thomas, do you want to pick up Will's rseq fix into the tip tree ?
Thanks,
Mathieu
Quoted 163 lines
---
v2 -> v3: Reintroduce
rseq_signal_deliver()arch/arm/kernel/signal.c | 4 ++-- arch/powerpc/kernel/signal.c | 4 ++-- arch/x86/entry/common.c | 2 +- arch/x86/kernel/signal.c | 2 +- include/linux/sched.h | 18 +++++++++++------- kernel/rseq.c | 7 ++++--- 6 files changed, 21 insertions(+), 16 deletions(-)arch/arm/kernel/signal.c +1
-1@@ -544,7 +544,7 @@ static void handle_signal(struct ksignal *ksig, structpt_regs *regs) * Increment event counter and perform fixup for the pre-signal * frame. */ -rseq_signal_deliver (regs); +rseq_signal_deliver (ksig, regs);/* * Set up the stack frame
arch/arm/kernel/signal.c +1
-1@@ -666,7 +666,7 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) } else {clear_thread_flag (TIF_NOTIFY_RESUME );tracehook_notify_resume (regs); -rseq_handle_notify_resume (regs); +rseq_handle_notify_resume (NULL , regs); } }local_irq_disable();arch/powerpc/kernel/signal.c +2
-2@@ -134,7 +134,7 @@ static void do_signal(struct task_struct *tsk)/* Re-enable the breakpoints for the signal stack */ thread_change_pc (tsk, tsk->thread.regs); -rseq_signal_deliver (tsk->thread.regs); +rseq_signal_deliver (&ksig, tsk->thread.regs);if (is32) {if (ksig.ka.sa.sa_flags &SA_SIGINFO )@@ -170,7 +170,7 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)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();arch/x86/entry/common.c +1
-1@@ -164,7 +164,7 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)if (cached_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); }if (
cached_flags&_TIF_USER_RETURN_NOTIFY)arch/x86/kernel/signal.c +1
-1@@ -692,7 +692,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)* Increment event counter and perform fixup for the pre-signal * frame. */ -rseq_signal_deliver (regs); +rseq_signal_deliver (ksig, regs);/* Set up the stack frame */ if (is_ia32_frame (ksig)) {include/linux/sched.h +7
-5@@ -1799,20 +1799,22 @@ static inline void rseq_set_notify_resume(struct task_struct *t)set_tsk_thread_flag (t ,TIF_NOTIFY_RESUME ); } -void __rseq_handle_notify_resume (struct pt_regs *regs); +void __rseq_handle_notify_resume (struct ksignal *sig,struct pt_regs *regs); -static inline void rseq_handle_notify_resume (struct pt_regs *regs) +static inline void rseq_handle_notify_resume (struct ksignal *ksig, +struct pt_regs *regs) {if (current->rseq) -__rseq_handle_notify_resume (regs); +__rseq_handle_notify_resume (ksig, regs); } -static inline void rseq_signal_deliver (struct pt_regs *regs) +static inline void rseq_signal_deliver (struct ksignal *ksig, +struct pt_regs *regs) {preempt_disable ();__set_bit (RSEQ_EVENT_SIGNAL_BIT , ¤t->rseq_event_mask);preempt_enable (); -rseq_handle_notify_resume (regs); +rseq_handle_notify_resume (ksig, regs); }/*
rseq_preempt()requires preemption to be disabled. */include/linux/sched.h +4
-2@@ -1864,10 +1866,12 @@ static inline void rseq_execve(struct task_struct *t)static inline void rseq_set_notify_resume (struct task_struct *t) { } -static inline void rseq_handle_notify_resume (struct pt_regs *regs) +static inline void rseq_handle_notify_resume (struct ksignal *ksig, +struct pt_regs *regs) { } -static inline void rseq_signal_deliver (struct pt_regs *regs) +static inline void rseq_signal_deliver (struct ksignal *ksig, +struct pt_regs *regs) { }static inline void rseq_preempt (struct task_struct *t)kernel/rseq.c +2
-2@@ -251,10 +251,10 @@ static int rseq_ip_fixup(struct pt_regs *regs)* respect to other threads scheduled on the same CPU, and with respect * to signal handlers. */ -void __rseq_handle_notify_resume (struct pt_regs *regs) +void __rseq_handle_notify_resume (struct ksignal *ksig,struct pt_regs *regs) {struct task_struct *t = current; -int ret; +int ret, sig;if (unlikely (t->flags &PF_EXITING ))return ;@@ -268,7 +268,8 @@ void __rseq_handle_notify_resume(struct pt_regs *regs)return ;error:
kernel/rseq.c +2
-1-force_sig (SIGSEGV , t); + sig = ksig ? ksig->sig :0 ; +force_sigsegv (sig, t);}
#ifdef
CONFIG_DEBUG_RSEQ
--
2.1.4
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com
tip-bot for Will Deacon
merge botrseq: Avoid infinite recursion when delivering SIGSEGV
Commit-ID: 784e0300fe9fe4aa81bd7df9d59e138f56bb605b Gitweb: https://git.kernel.org/tip/784e0300fe9fe4aa81bd7df9d59e138f56bb605b Author: Will Deacon <[email protected]> AuthorDate: Fri, 22 Jun 2018 11:45:07 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 22 Jun 2018 19:04:22 +0200
rseq: Avoid infinite recursion when delivering SIGSEGV
When delivering a signal to a task that is using rseq, we call into __rseq_handle_notify_resume() so that the registers pushed in the sigframe are updated to reflect the state of the restartable sequence (for example, ensuring that the signal returns to the abort handler if necessary).
However, if the rseq management fails due to an unrecoverable fault when accessing userspace or certain combinations of RSEQ_CS_* flags, then we will attempt to deliver a SIGSEGV. This has the potential for infinite recursion if the rseq code continuously fails on signal delivery.
Avoid this problem by using force_sigsegv() instead of force_sig(), which is explicitly designed to reset the SEGV handler to SIG_DFL in the case of a recursive fault. In doing so, remove rseq_signal_deliver() from the internal rseq API and have an optional struct ksignal * parameter to rseq_handle_notify_resume() instead.
--- arch/arm/kernel/signal.c | 4 ++-- arch/powerpc/kernel/signal.c | 4 ++-- arch/x86/entry/common.c | 2 +- arch/x86/kernel/signal.c | 2 +- include/linux/sched.h | 18 +++++++++++------- kernel/rseq.c | 7 ++++--- 6 files changed, 21 insertions(+), 16 deletions(-)
arch/arm/kernel/signal.c +2 -2
@@ -544,7 +544,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)* Increment event counter and perform fixup for the pre-signal * frame. */ -rseq_signal_deliver (regs); +rseq_signal_deliver (ksig, regs);/* * Set up the stack frame
@@ -666,7 +666,7 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) }else {clear_thread_flag (TIF_NOTIFY_RESUME );tracehook_notify_resume (regs); -rseq_handle_notify_resume (regs); +rseq_handle_notify_resume (NULL , regs); } }local_irq_disable ();
arch/powerpc/kernel/signal.c +2 -2
@@ -134,7 +134,7 @@ static void do_signal(struct task_struct *tsk)/* Re-enable the breakpoints for the signal stack */ thread_change_pc (tsk, tsk->thread.regs); -rseq_signal_deliver (tsk->thread.regs); +rseq_signal_deliver (&ksig, tsk->thread.regs);if (is32) {if (ksig.ka.sa.sa_flags &SA_SIGINFO )
@@ -170,7 +170,7 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)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 ();
arch/x86/entry/common.c +1 -1
@@ -164,7 +164,7 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)if (cached_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); }if (cached_flags & _TIF_USER_RETURN_NOTIFY)
arch/x86/kernel/signal.c +1 -1
@@ -692,7 +692,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)* Increment event counter and perform fixup for the pre-signal * frame. */ -rseq_signal_deliver (regs); +rseq_signal_deliver (ksig, regs);/* Set up the stack frame */ if (is_ia32_frame (ksig)) {
include/linux/sched.h +11 -7
@@ -1799,20 +1799,22 @@ static inline void rseq_set_notify_resume(struct task_struct *t)set_tsk_thread_flag (t,TIF_NOTIFY_RESUME ); } -void __rseq_handle_notify_resume (struct pt_regs *regs); +void __rseq_handle_notify_resume (struct ksignal *sig,struct pt_regs *regs); -static inline void rseq_handle_notify_resume (struct pt_regs *regs) +static inline void rseq_handle_notify_resume (struct ksignal *ksig, +struct pt_regs *regs) {if (current->rseq) -__rseq_handle_notify_resume (regs); +__rseq_handle_notify_resume (ksig, regs); } -static inline void rseq_signal_deliver (struct pt_regs *regs) +static inline void rseq_signal_deliver (struct ksignal *ksig, +struct pt_regs *regs) {preempt_disable ();__set_bit (RSEQ_EVENT_SIGNAL_BIT , ¤t->rseq_event_mask);preempt_enable (); -rseq_handle_notify_resume (regs); +rseq_handle_notify_resume (ksig, regs); }/* rseq_preempt() requires preemption to be disabled. */
@@ -1861,10 +1863,12 @@ static inline void rseq_execve(struct task_struct *t)static inline void rseq_set_notify_resume (struct task_struct *t) { } -static inline void rseq_handle_notify_resume (struct pt_regs *regs) +static inline void rseq_handle_notify_resume (struct ksignal *ksig, +struct pt_regs *regs) { } -static inline void rseq_signal_deliver (struct pt_regs *regs) +static inline void rseq_signal_deliver (struct ksignal *ksig, +struct pt_regs *regs) { }static inline void rseq_preempt (struct task_struct *t)
kernel/rseq.c +4 -3
@@ -251,10 +251,10 @@ static int rseq_ip_fixup(struct pt_regs *regs)* respect to other threads scheduled on the same CPU, and with respect * to signal handlers. */ -void __rseq_handle_notify_resume (struct pt_regs *regs) +void __rseq_handle_notify_resume (struct ksignal *ksig,struct pt_regs *regs) {struct task_struct *t = current; -int ret; +int ret, sig;if (unlikely (t->flags &PF_EXITING ))return ;
@@ -268,7 +268,8 @@ void __rseq_handle_notify_resume(struct pt_regs *regs)return ; error: -force_sig (SIGSEGV , t); + sig = ksig ? ksig->sig :0 ; +force_sigsegv (sig, t); }#ifdef CONFIG_DEBUG_RSEQ