Skip to content

Commit

Permalink
signalfd: make it group-wide, fix posix-timers scheduling
Browse files Browse the repository at this point in the history
With this patch any thread can dequeue its own private signals via signalfd,
even if it was created by another sub-thread.

To do so, we pass "current" to dequeue_signal() if the caller is from the same
thread group. This also fixes the scheduling of posix timers broken by the
previous patch.

If the caller doesn't belong to this thread group, we can't handle __SI_TIMER
case properly anyway. Perhaps we should forbid the cross-process signalfd usage
and convert ctx->tsk to ctx->sighand.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Davide Libenzi <davidel@xmailserver.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Roland McGrath <roland@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Aug 23, 2007
1 parent 834d216 commit f9ee228
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
9 changes: 2 additions & 7 deletions fs/exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -779,19 +779,13 @@ static int de_thread(struct task_struct *tsk)
struct task_struct *leader = NULL;
int count;

/*
* Tell all the sighand listeners that this sighand has
* been detached. The signalfd_detach() function grabs the
* sighand lock, if signal listeners are present on the sighand.
*/
signalfd_detach(tsk);

/*
* If we don't share sighandlers, then we aren't sharing anything
* and we can just re-use it all.
*/
if (atomic_read(&oldsighand->count) <= 1) {
BUG_ON(atomic_read(&sig->count) != 1);
signalfd_detach(tsk);
exit_itimers(sig);
return 0;
}
Expand Down Expand Up @@ -930,6 +924,7 @@ static int de_thread(struct task_struct *tsk)
sig->flags = 0;

no_thread_group:
signalfd_detach(tsk);
exit_itimers(sig);
if (leader)
release_task(leader);
Expand Down
14 changes: 10 additions & 4 deletions fs/signalfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,18 @@ static int signalfd_lock(struct signalfd_ctx *ctx, struct signalfd_lockctx *lk)
sighand = lock_task_sighand(lk->tsk, &lk->flags);
rcu_read_unlock();

if (sighand && !ctx->tsk) {
if (!sighand)
return 0;

if (!ctx->tsk) {
unlock_task_sighand(lk->tsk, &lk->flags);
sighand = NULL;
return 0;
}

return sighand != NULL;
if (lk->tsk->tgid == current->tgid)
lk->tsk = current;

return 1;
}

static void signalfd_unlock(struct signalfd_lockctx *lk)
Expand Down Expand Up @@ -331,7 +337,7 @@ asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemas

init_waitqueue_head(&ctx->wqh);
ctx->sigmask = sigmask;
ctx->tsk = current;
ctx->tsk = current->group_leader;

sighand = current->sighand;
/*
Expand Down

0 comments on commit f9ee228

Please sign in to comment.