Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
torvalds committed Aug 17, 2012
2 parents 9d0f814 + 7612bfe commit 0b0402d
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions security/yama/yama_lsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 0b0402d

Please sign in to comment.