diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 09:57:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 09:57:16 -0700 |
| commit | 853da0022023c046e0a5ccc51d427745f0c94de7 (patch) | |
| tree | bc36f80f00aa11c3c239a80ecf04ba8238219ce8 /kernel/ptrace.c | |
| parent | 5884c40668a928bba017eaf54e2eb3c01c8a98e6 (diff) | |
| parent | 0a4ff8c2598b72f2fa9d50aae9e1809e684dbf41 (diff) | |
Merge branch 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
[PATCH] Abnormal End of Processes
[PATCH] match audit name data
[PATCH] complete message queue auditing
[PATCH] audit inode for all xattr syscalls
[PATCH] initialize name osid
[PATCH] audit signal recipients
[PATCH] add SIGNAL syscall class (v3)
[PATCH] auditing ptrace
Diffstat (limited to 'kernel/ptrace.c')
| -rw-r--r-- | kernel/ptrace.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 4d50e06fd74..ad7949a589d 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -18,6 +18,7 @@ #include <linux/ptrace.h> #include <linux/security.h> #include <linux/signal.h> +#include <linux/audit.h> #include <asm/pgtable.h> #include <asm/uaccess.h> @@ -161,6 +162,8 @@ int ptrace_attach(struct task_struct *task) { int retval; + audit_ptrace(task); + retval = -EPERM; if (task->pid <= 1) goto out; |