diff options
-rw-r--r-- | kernel/signal.c | 12 |
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 | ||
826 | static int send_signal(int sig, struct siginfo *info, struct task_struct *t, | 826 | static 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 | ||
902 | static 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 | |||
902 | int print_fatal_signals; | 908 | int print_fatal_signals; |
903 | 909 | ||
904 | static void print_fatal_signal(struct pt_regs *regs, int signr) | 910 | static 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 | } |
1149 | out_unlock: | 1155 | out_unlock: |