From 51c1d2b1cbbdba5c977c991c2c420e78512c2a3f Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Thu, 9 Feb 2006 22:41:50 +0300 Subject: [PATCH] --- yaml --- r: 20157 b: refs/heads/master c: 9ac95f2f90e022c16d293d7978faddf7e779a1a9 h: refs/heads/master i: 20155: b1d1c2bde728e3f2b4d633f64ed3804593283ad4 v: v3 --- [refs] | 2 +- trunk/include/linux/sched.h | 2 +- trunk/kernel/signal.c | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 36fd2c5c14ef..3db0674a1bc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c70d3d703ad94727dab2a3664aeee33d71e00715 +refs/heads/master: 9ac95f2f90e022c16d293d7978faddf7e779a1a9 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 0cfcd1c7865e..9c1da0269a18 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1098,7 +1098,7 @@ extern struct sigqueue *sigqueue_alloc(void); extern void sigqueue_free(struct sigqueue *); extern int send_sigqueue(int, struct sigqueue *, struct task_struct *); extern int send_group_sigqueue(int, struct sigqueue *, struct task_struct *); -extern int do_sigaction(int, const struct k_sigaction *, struct k_sigaction *); +extern int do_sigaction(int, struct k_sigaction *, struct k_sigaction *); extern int do_sigaltstack(const stack_t __user *, stack_t __user *, unsigned long); /* These can be the second arg to send_sig_info/send_group_sig_info. */ diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index 01a1e7f7acf7..ea154104a00b 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -2430,7 +2430,7 @@ sys_rt_sigqueueinfo(int pid, int sig, siginfo_t __user *uinfo) } int -do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact) +do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact) { struct k_sigaction *k; sigset_t mask; @@ -2454,6 +2454,8 @@ do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact) *oact = *k; if (act) { + sigdelsetmask(&act->sa.sa_mask, + sigmask(SIGKILL) | sigmask(SIGSTOP)); /* * POSIX 3.3.1.3: * "Setting a signal action to SIG_IGN for a signal that is @@ -2479,8 +2481,6 @@ do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact) read_lock(&tasklist_lock); spin_lock_irq(&t->sighand->siglock); *k = *act; - sigdelsetmask(&k->sa.sa_mask, - sigmask(SIGKILL) | sigmask(SIGSTOP)); sigemptyset(&mask); sigaddset(&mask, sig); rm_from_queue_full(&mask, &t->signal->shared_pending); @@ -2495,8 +2495,6 @@ do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact) } *k = *act; - sigdelsetmask(&k->sa.sa_mask, - sigmask(SIGKILL) | sigmask(SIGSTOP)); } spin_unlock_irq(¤t->sighand->siglock);