mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-21 14:11:20 +00:00
signal: Pass pid and pid type into send_sigqueue
Make the code more maintainable by performing more of the signal related work in send_sigqueue. A quick inspection of do_timer_create will show that this code path does not lookup a thread group by a thread's pid. Making it safe to find the task pointed to by it_pid with "pid_task(it_pid, type)"; This supports the changes needed in fork to tell if a signal was sent to a single process or a group of processes. Having the pid to task transition in signal.c will also make it easier to sort out races with de_thread and and the thread group leader exiting when it comes time to address that. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
parent
2118e1f53f
commit
24122c7f49
3 changed files with 14 additions and 15 deletions
|
@ -1664,17 +1664,20 @@ void sigqueue_free(struct sigqueue *q)
|
|||
__sigqueue_free(q);
|
||||
}
|
||||
|
||||
int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group)
|
||||
int send_sigqueue(struct sigqueue *q, struct pid *pid, enum pid_type type)
|
||||
{
|
||||
int sig = q->info.si_signo;
|
||||
struct sigpending *pending;
|
||||
struct task_struct *t;
|
||||
unsigned long flags;
|
||||
int ret, result;
|
||||
|
||||
BUG_ON(!(q->flags & SIGQUEUE_PREALLOC));
|
||||
|
||||
ret = -1;
|
||||
if (!likely(lock_task_sighand(t, &flags)))
|
||||
rcu_read_lock();
|
||||
t = pid_task(pid, type);
|
||||
if (!t || !likely(lock_task_sighand(t, &flags)))
|
||||
goto ret;
|
||||
|
||||
ret = 1; /* the signal is ignored */
|
||||
|
@ -1696,15 +1699,16 @@ int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group)
|
|||
q->info.si_overrun = 0;
|
||||
|
||||
signalfd_notify(t, sig);
|
||||
pending = group ? &t->signal->shared_pending : &t->pending;
|
||||
pending = (type != PIDTYPE_PID) ? &t->signal->shared_pending : &t->pending;
|
||||
list_add_tail(&q->list, &pending->list);
|
||||
sigaddset(&pending->signal, sig);
|
||||
complete_signal(sig, t, group);
|
||||
complete_signal(sig, t, type != PIDTYPE_PID);
|
||||
result = TRACE_SIGNAL_DELIVERED;
|
||||
out:
|
||||
trace_signal_generate(sig, &q->info, t, group, result);
|
||||
trace_signal_generate(sig, &q->info, t, type != PIDTYPE_PID, result);
|
||||
unlock_task_sighand(t, &flags);
|
||||
ret:
|
||||
rcu_read_unlock();
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue