Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6050b33f authored Jan 20, 2016 by Jann Horn Committed by Sasha Levin Apr 13, 2016

security: let security modules use PTRACE_MODE_* with bitmasks



[ Upstream commit 3dfb7d8cdbc7ea0c2970450e60818bb3eefbad69 ]

It looks like smack and yama weren't aware that the ptrace mode
can have flags ORed into it - PTRACE_MODE_NOAUDIT until now, but
only for /proc/$pid/stat, and with the PTRACE_MODE_*CREDS patch,
all modes have flags ORed into them.

Signed-off-by: Jann Horn <jann@thejh.net>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Morris <james.l.morris@oracle.com>
Cc: "Serge E. Hallyn" <serge.hallyn@ubuntu.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Willy Tarreau <w@1wt.eu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 805d5d71

security/smack/smack_lsm.c

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -308,12 +308,10 @@ static int smk_copy_rules(struct list_head nhead, struct list_head ohead,
	*/		*/
	static inline unsigned int smk_ptrace_mode(unsigned int mode)		static inline unsigned int smk_ptrace_mode(unsigned int mode)
	{		{
	switch (mode) {		if (mode & PTRACE_MODE_ATTACH)
	case PTRACE_MODE_READ:
	return MAY_READ;
	case PTRACE_MODE_ATTACH:
	return MAY_READWRITE;		return MAY_READWRITE;
	}		if (mode & PTRACE_MODE_READ)
			return MAY_READ;

	return 0;		return 0;
	}		}

security/yama/yama_lsm.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -292,7 +292,7 @@ int yama_ptrace_access_check(struct task_struct *child,
	return rc;		return rc;

	/* require ptrace target be a child of ptracer on attach */		/* require ptrace target be a child of ptracer on attach */
	if (mode == PTRACE_MODE_ATTACH) {		if (mode & PTRACE_MODE_ATTACH) {
	switch (ptrace_scope) {		switch (ptrace_scope) {
	case YAMA_SCOPE_DISABLED:		case YAMA_SCOPE_DISABLED:
	/* No additional restrictions. */		/* No additional restrictions. */
	@@ -318,7 +318,7 @@ int yama_ptrace_access_check(struct task_struct *child,
	}		}
	}		}

	if (rc) {		if (rc && (mode & PTRACE_MODE_NOAUDIT) == 0) {
	printk_ratelimited(KERN_NOTICE		printk_ratelimited(KERN_NOTICE
	"ptrace of pid %d was attempted by: %s (pid %d)\n",		"ptrace of pid %d was attempted by: %s (pid %d)\n",
	child->pid, current->comm, current->pid);		child->pid, current->comm, current->pid);