Commit 0b0402d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9d0f8140 7612bfee

security/yama/yama_lsm.c

+2 −8
Original line number Diff line number Diff line
@@ -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;