1 files changed, 26 insertions, 6 deletions

diff --git a/kernel/signal.c b/kernel/signal.c
index 2ac3a668d9dd..364fc95bf97c 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -21,6 +21,7 @@
 #include <linux/syscalls.h>
 #include <linux/ptrace.h>
 #include <linux/signal.h>
+#include <linux/signalfd.h>
 #include <linux/capability.h>
 #include <linux/freezer.h>
 #include <linux/pid_namespace.h>
@@ -113,8 +114,7 @@ void recalc_sigpending(void)
 
 /* Given the mask, find the first available signal that should be serviced. */
 
-static int
-next_signal(struct sigpending *pending, sigset_t *mask)
+int next_signal(struct sigpending *pending, sigset_t *mask)
 {
         unsigned long i, *s, *m, x;
         int sig = 0;
@@ -497,6 +497,11 @@ static int check_kill_permission(int sig, struct siginfo *info,
         int error = -EINVAL;
         if (!valid_signal(sig))
                 return error;
+
+        error = audit_signal_info(sig, t); /* Let audit system see the signal */
+        if (error)
+                return error;
+
         error = -EPERM;
         if ((info == SEND_SIG_NOINFO || (!is_si_special(info) && SI_FROMUSER(info)))
             && ((sig != SIGCONT) ||
@@ -506,10 +511,7 @@ static int check_kill_permission(int sig, struct siginfo *info,
             && !capable(CAP_KILL))
                 return error;
 
-        error = security_task_kill(t, info, sig, 0);
-        if (!error)
-                audit_signal_info(sig, t); /* Let audit system see the signal */
-        return error;
+        return security_task_kill(t, info, sig, 0);
 }
 
 /* forward decl */
@@ -630,6 +632,12 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
         int ret = 0;
 
         /*
+         * Deliver the signal to listening signalfds. This must be called
+         * with the sighand lock held.
+         */
+        signalfd_notify(t, sig);
+
+        /*
          * fast-pathed signals for kernel-internal things like SIGSTOP
          * or SIGKILL.
          */
@@ -1280,6 +1288,11 @@ int send_sigqueue(int sig, struct sigqueue *q, struct task_struct *p)
                 ret = 1;
                 goto out;
         }
+        /*
+         * Deliver the signal to listening signalfds. This must be called
+         * with the sighand lock held.
+         */
+        signalfd_notify(p, sig);
 
         list_add_tail(&q->list, &p->pending.list);
         sigaddset(&p->pending.signal, sig);
@@ -1323,6 +1336,11 @@ send_group_sigqueue(int sig, struct sigqueue *q, struct task_struct *p)
                 q->info.si_overrun++;
                 goto out;
         } 
+        /*
+         * Deliver the signal to listening signalfds. This must be called
+         * with the sighand lock held.
+         */
+        signalfd_notify(p, sig);
 
         /*
          * Put this signal on the shared-pending queue.
@@ -1983,6 +2001,8 @@ int copy_siginfo_to_user(siginfo_t __user *to, siginfo_t *from)
         /*
          * If you change siginfo_t structure, please be sure
          * this code is fixed accordingly.
+         * Please remember to update the signalfd_copyinfo() function
+         * inside fs/signalfd.c too, in case siginfo_t changes.
          * It should never copy any pad contained in the structure
          * to avoid security leaks, but must copy the generic
          * 3 ints plus the relevant union member.