aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
authorSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>2009-04-02 19:58:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-02 22:04:58 -0400
commit7978b567d31555fc828b8f945c605ad29e117b22 (patch)
treea66d7880f3031e417c2afb76c990ed5340565816 /kernel/signal.c
parentf008faff0e2777c8b3fe853891b774ca465938d8 (diff)
signals: add from_ancestor_ns parameter to send_signal()
send_signal() (or its helper) needs to determine the pid namespace of the sender. But a signal sent via kill_pid_info_as_uid() comes from within the kernel and send_signal() does not need to determine the pid namespace of the sender. So define a helper for send_signal() which takes an additional parameter, 'from_ancestor_ns' and have kill_pid_info_as_uid() use that helper directly. The 'from_ancestor_ns' parameter will be used in a follow-on patch. Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Cc: Oleg Nesterov <oleg@tv-sign.ru> Cc: Roland McGrath <roland@redhat.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Daniel Lezcano <daniel.lezcano@free.fr> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 8bf7a40e5c71..7b6de962a1af 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -823,8 +823,8 @@ static inline int legacy_queue(struct sigpending *signals, int sig)
823 return (sig < SIGRTMIN) && sigismember(&signals->signal, sig); 823 return (sig < SIGRTMIN) && sigismember(&signals->signal, sig);
824} 824}
825 825
826static int send_signal(int sig, struct siginfo *info, struct task_struct *t, 826static int __send_signal(int sig, struct siginfo *info, struct task_struct *t,
827 int group) 827 int group, int from_ancestor_ns)
828{ 828{
829 struct sigpending *pending; 829 struct sigpending *pending;
830 struct sigqueue *q; 830 struct sigqueue *q;
@@ -899,6 +899,12 @@ out_set:
899 return 0; 899 return 0;
900} 900}
901 901
902static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
903 int group)
904{
905 return __send_signal(sig, info, t, group, 0);
906}
907
902int print_fatal_signals; 908int print_fatal_signals;
903 909
904static void print_fatal_signal(struct pt_regs *regs, int signr) 910static void print_fatal_signal(struct pt_regs *regs, int signr)
@@ -1143,7 +1149,7 @@ int kill_pid_info_as_uid(int sig, struct siginfo *info, struct pid *pid,
1143 if (sig && p->sighand) { 1149 if (sig && p->sighand) {
1144 unsigned long flags; 1150 unsigned long flags;
1145 spin_lock_irqsave(&p->sighand->siglock, flags); 1151 spin_lock_irqsave(&p->sighand->siglock, flags);
1146 ret = __group_send_sig_info(sig, info, p); 1152 ret = __send_signal(sig, info, p, 1, 0);
1147 spin_unlock_irqrestore(&p->sighand->siglock, flags); 1153 spin_unlock_irqrestore(&p->sighand->siglock, flags);
1148 } 1154 }
1149out_unlock: 1155out_unlock: