diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 13:54:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 13:54:12 -0700 |
| commit | 19fa95e9e999ee2b0d7adfbd1a687b136afcd6f1 (patch) | |
| tree | 99bd4cf3f47965b52f43a5fde01b2e53e01f77ba /kernel/signal.c | |
| parent | ba483d574b43b05fa4c78550b874c7e24424ff2a (diff) | |
| parent | 0107b3cf3225aed6ddde4fa8dbcd4ed643b34f4d (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 7 |
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 */ |