diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-17 20:17:11 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-17 20:17:11 +0400 |
| commit | 0b0402d45326bc167d1652169c7ce5669f973730 (patch) | |
| tree | 1f36e2898527eec7b4585eae236cb0a06d65b2bd | |
| parent | 9d0f8140fc8a723af4eb1ec4d757847515649574 (diff) | |
| parent | 7612bfeecc197bbb6629842b5c6ff1967f0a9b70 (diff) | |
| download | linux-0b0402d45326bc167d1652169c7ce5669f973730.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull a Yama bugfix from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
Yama: access task_struct->comm directly
| -rw-r--r-- | security/yama/yama_lsm.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c index d51b7c76c37d..0cc99a3ea42d 100644 --- a/security/yama/yama_lsm.c +++ b/security/yama/yama_lsm.c @@ -279,12 +279,9 @@ static int yama_ptrace_access_check(struct task_struct *child, } if (rc) { - char name[sizeof(current->comm)]; printk_ratelimited(KERN_NOTICE "ptrace of pid %d was attempted by: %s (pid %d)\n", - child->pid, - get_task_comm(name, current), - current->pid); + child->pid, current->comm, current->pid); } return rc; @@ -319,12 +316,9 @@ static int yama_ptrace_traceme(struct task_struct *parent) } if (rc) { - char name[sizeof(current->comm)]; printk_ratelimited(KERN_NOTICE "ptraceme of pid %d was attempted by: %s (pid %d)\n", - current->pid, - get_task_comm(name, parent), - parent->pid); + current->pid, parent->comm, parent->pid); } return rc; |