diff options
author | Oleg Nesterov <oleg@redhat.com> | 2015-06-04 16:22:16 -0400 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2015-06-04 16:22:16 -0400 |
commit | 9e7c8f8c62c1e1cda203b5bfaba4575b141e42e7 (patch) | |
tree | ffbe4be8b34649fd07898137aeb74404f4fa093f /security | |
parent | cded3fffbeab777e6ad2ec05d4a3b62c5caca0f3 (diff) |
signals: don't abuse __flush_signals() in selinux_bprm_committed_creds()
selinux_bprm_committed_creds()->__flush_signals() is not right, we
shouldn't clear TIF_SIGPENDING unconditionally. There can be other
reasons for signal_pending(): freezing(), JOBCTL_PENDING_MASK, and
potentially more.
Also change this code to check fatal_signal_pending() rather than
SIGNAL_GROUP_EXIT, it looks a bit better.
Now we can kill __flush_signals() before it finds another buggy user.
Note: this code looks racy, we can flush a signal which was sent after
the task SID has been updated.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Paul Moore <pmoore@redhat.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/hooks.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 99c4a00cce4e..8abbd548ece9 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -2416,10 +2416,12 @@ static void selinux_bprm_committed_creds(struct linux_binprm *bprm) | |||
2416 | for (i = 0; i < 3; i++) | 2416 | for (i = 0; i < 3; i++) |
2417 | do_setitimer(i, &itimer, NULL); | 2417 | do_setitimer(i, &itimer, NULL); |
2418 | spin_lock_irq(¤t->sighand->siglock); | 2418 | spin_lock_irq(¤t->sighand->siglock); |
2419 | if (!(current->signal->flags & SIGNAL_GROUP_EXIT)) { | 2419 | if (!fatal_signal_pending(current)) { |
2420 | __flush_signals(current); | 2420 | flush_sigqueue(¤t->pending); |
2421 | flush_sigqueue(¤t->signal->shared_pending); | ||
2421 | flush_signal_handlers(current, 1); | 2422 | flush_signal_handlers(current, 1); |
2422 | sigemptyset(¤t->blocked); | 2423 | sigemptyset(¤t->blocked); |
2424 | recalc_sigpending(); | ||
2423 | } | 2425 | } |
2424 | spin_unlock_irq(¤t->sighand->siglock); | 2426 | spin_unlock_irq(¤t->sighand->siglock); |
2425 | } | 2427 | } |