fork: don't copy inconsistent signal handler state to child
Subsystems (3)
PATCH 1/1 fork: don't copy inconsistent signal handler state to child
Before this change, if a multithreaded process forks while one of its threads is changing a signal handler using sigaction(), the memcpy() in copy_sighand() can race with the struct assignment in do_sigaction(). It isn't clear whether this can cause corruption of the userspace signal handler pointer, but it definitely can cause inconsistency between different fields of struct sigaction.
Take the appropriate spinlock to avoid this.
I have tested that this patch prevents inconsistency between sa_sigaction and sa_flags, which is possible before this patch.
---
I haven't added a CC stable line to this patch because I feel that it doesn't quite meet the bar; if anyone disagrees, please say so.
kernel/fork.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/fork.c +2 -0
@@ -1394,7 +1394,9 @@ static int copy_sighand(unsigned long clone_flags, struct task_struct *tsk)return -ENOMEM ;atomic_set (&sig->count,1 ); +spin_lock_irq (¤t->sighand->siglock);memcpy (sig->action, current->sighand->action,sizeof (sig->action)); +spin_unlock_irq (¤t->sighand->siglock);return 0 ; }
Signature · 1 line
2.18.0.399.gad0ab374a1-goog
Quoted 11 lines · Jann Horn
Before this change, if a multithreaded process forks while one of its threads is changing a signal handler using
sigaction(), thememcpy()incopy_sighand()can race with the struct assignment indo_sigaction(). It isn't clear whether this can cause corruption of the userspace signal handler pointer, but it definitely can cause inconsistency between different fields of struct sigaction.Take the appropriate spinlock to avoid this.
I have tested that this patch prevents inconsistency between
sa_sigactionandsa_flags, which is possible before this patch.
Looks sensible to me.
Quoted 1 line
Signed-off-by Jann Horn <[email protected]>
Quoted 25 lines
---
I haven't added a CC stable line to this patch because I feel that it doesn't quite meet the bar; if anyone disagrees, please say so.kernel/fork.c | 2 ++ 1 file changed, 2 insertions(+)kernel/fork.c +2
-0@@ -1394,7 +1394,9 @@ static int copy_sighand(unsigned long clone_flags, struct task_struct *tsk)return -ENOMEM ;atomic_set (&sig->count,1 ); +spin_lock_irq (¤t->sighand->siglock);memcpy (sig->action, current->sighand->action,sizeof (sig->action)); +spin_unlock_irq (¤t->sighand->siglock);return 0 ; }Signature · 1 line
2.18.0.399.gad0ab374a1-goog
Signature · 2 lines
Michal Hocko SUSE Labs