Merge with /home/shaggy/git/linus-clean/

1 files changed, 6 insertions, 1 deletions

diff --git a/kernel/signal.c b/kernel/signal.c
index b3c24c732c5a..c89821b69ae3 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -24,6 +24,7 @@
 #include <linux/ptrace.h>
 #include <linux/posix-timers.h>
 #include <linux/signal.h>
+#include <linux/audit.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -667,7 +668,11 @@ static int check_kill_permission(int sig, struct siginfo *info,
             && (current->uid ^ t->suid) && (current->uid ^ t->uid)
             && !capable(CAP_KILL))
                 return error;
-        return security_task_kill(t, info, sig);
+
+        error = security_task_kill(t, info, sig);
+        if (!error)
+                audit_signal_info(sig, t); /* Let audit system see the signal */
+        return error;
 }
 
 /* forward decl */