All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] futex: do not leak robust list to unprivileged process
@ 2012-03-19 23:12 ` Kees Cook
  0 siblings, 0 replies; 78+ messages in thread
From: Kees Cook @ 2012-03-19 23:12 UTC (permalink / raw)
  To: linux-kernel
  Cc: Darren Hart, Thomas Gleixner, Peter Zijlstra, Andrew Morton,
	Jiri Kosina, Eric W. Biederman, David Howells, Serge E. Hallyn,
	kernel-hardening, spender

It was possible to extract the robust list head address from a setuid
process if it had used set_robust_list(), allowing an ASLR info leak. This
changes the permission checks to be the same as those used for similar
info that comes out of /proc.

Running a setuid program that uses robust futexes would have had:
  cred->euid != pcred->euid
  cred->euid == pcred->uid
so the old permissions check would allow it. I'm not aware of any setuid
programs that use robust futexes, so this is just a preventative measure.

(This patch is based on changes from grsecurity.)

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 kernel/futex.c        |   36 +++++++++++++-----------------------
 kernel/futex_compat.c |   36 +++++++++++++-----------------------
 2 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/kernel/futex.c b/kernel/futex.c
index 1614be2..439440d 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -59,6 +59,7 @@
 #include <linux/magic.h>
 #include <linux/pid.h>
 #include <linux/nsproxy.h>
+#include <linux/ptrace.h>
 
 #include <asm/futex.h>
 
@@ -2443,40 +2444,29 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
 {
 	struct robust_list_head __user *head;
 	unsigned long ret;
-	const struct cred *cred = current_cred(), *pcred;
+	struct task_struct *p;
 
 	if (!futex_cmpxchg_enabled)
 		return -ENOSYS;
 
+	rcu_read_lock();
+
+	ret = -ESRCH;
 	if (!pid)
-		head = current->robust_list;
+		p = current;
 	else {
-		struct task_struct *p;
-
-		ret = -ESRCH;
-		rcu_read_lock();
 		p = find_task_by_vpid(pid);
 		if (!p)
 			goto err_unlock;
-		ret = -EPERM;
-		pcred = __task_cred(p);
-		/* If victim is in different user_ns, then uids are not
-		   comparable, so we must have CAP_SYS_PTRACE */
-		if (cred->user->user_ns != pcred->user->user_ns) {
-			if (!ns_capable(pcred->user->user_ns, CAP_SYS_PTRACE))
-				goto err_unlock;
-			goto ok;
-		}
-		/* If victim is in same user_ns, then uids are comparable */
-		if (cred->euid != pcred->euid &&
-		    cred->euid != pcred->uid &&
-		    !ns_capable(pcred->user->user_ns, CAP_SYS_PTRACE))
-			goto err_unlock;
-ok:
-		head = p->robust_list;
-		rcu_read_unlock();
 	}
 
+	ret = -EPERM;
+	if (!ptrace_may_access(p, PTRACE_MODE_READ))
+		goto err_unlock;
+
+	head = p->robust_list;
+	rcu_read_unlock();
+
 	if (put_user(sizeof(*head), len_ptr))
 		return -EFAULT;
 	return put_user(head, head_ptr);
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index 5f9e689..a9642d5 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -10,6 +10,7 @@
 #include <linux/compat.h>
 #include <linux/nsproxy.h>
 #include <linux/futex.h>
+#include <linux/ptrace.h>
 
 #include <asm/uaccess.h>
 
@@ -136,40 +137,29 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
 {
 	struct compat_robust_list_head __user *head;
 	unsigned long ret;
-	const struct cred *cred = current_cred(), *pcred;
+	struct task_struct *p;
 
 	if (!futex_cmpxchg_enabled)
 		return -ENOSYS;
 
+	rcu_read_lock();
+
+	ret = -ESRCH;
 	if (!pid)
-		head = current->compat_robust_list;
+		p = current;
 	else {
-		struct task_struct *p;
-
-		ret = -ESRCH;
-		rcu_read_lock();
 		p = find_task_by_vpid(pid);
 		if (!p)
 			goto err_unlock;
-		ret = -EPERM;
-		pcred = __task_cred(p);
-		/* If victim is in different user_ns, then uids are not
-		   comparable, so we must have CAP_SYS_PTRACE */
-		if (cred->user->user_ns != pcred->user->user_ns) {
-			if (!ns_capable(pcred->user->user_ns, CAP_SYS_PTRACE))
-				goto err_unlock;
-			goto ok;
-		}
-		/* If victim is in same user_ns, then uids are comparable */
-		if (cred->euid != pcred->euid &&
-		    cred->euid != pcred->uid &&
-		    !ns_capable(pcred->user->user_ns, CAP_SYS_PTRACE))
-			goto err_unlock;
-ok:
-		head = p->compat_robust_list;
-		rcu_read_unlock();
 	}
 
+	ret = -EPERM;
+	if (!ptrace_may_access(p, PTRACE_MODE_READ))
+		goto err_unlock;
+
+	head = p->compat_robust_list;
+	rcu_read_unlock();
+
 	if (put_user(sizeof(*head), len_ptr))
 		return -EFAULT;
 	return put_user(ptr_to_compat(head), head_ptr);
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 78+ messages in thread

end of thread, other threads:[~2012-08-03 18:06 UTC | newest]

Thread overview: 78+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-19 23:12 [PATCH] futex: do not leak robust list to unprivileged process Kees Cook
2012-03-19 23:12 ` [kernel-hardening] " Kees Cook
2012-03-20 13:31 ` Serge Hallyn
2012-03-20 13:31   ` [kernel-hardening] " Serge Hallyn
2012-03-20 17:02   ` Thomas Gleixner
2012-03-20 17:02     ` [kernel-hardening] " Thomas Gleixner
2012-03-20 17:11     ` Kees Cook
2012-03-20 17:11       ` [kernel-hardening] " Kees Cook
2012-03-20 17:23       ` Ingo Molnar
2012-03-20 17:23         ` [kernel-hardening] " Ingo Molnar
2012-03-22 23:46         ` Thomas Gleixner
2012-03-22 23:46           ` [kernel-hardening] " Thomas Gleixner
2012-03-23 17:58           ` [PATCH] futex: mark get_robust_list as deprecated Kees Cook
2012-03-23 17:58             ` [kernel-hardening] " Kees Cook
2012-03-23 18:27             ` Thomas Gleixner
2012-03-23 18:27               ` [kernel-hardening] " Thomas Gleixner
2012-03-23 19:08               ` Kees Cook
2012-03-23 19:08                 ` [kernel-hardening] " Kees Cook
2012-03-23 19:08               ` [PATCH v2] " Kees Cook
2012-03-23 19:08                 ` [kernel-hardening] " Kees Cook
     [not found]                 ` <20120323190855.GA27213-0X9Bc/hWBUTk6RaD4rd5nQ@public.gmane.org>
2012-03-23 22:06                   ` Eric W. Biederman
2012-03-23 22:06                     ` [kernel-hardening] " Eric W. Biederman
2012-03-23 22:06                     ` Eric W. Biederman
     [not found]                     ` <m1fwczvuph.fsf-+imSwln9KH6u2/kzUuoCbdi2O/JbrIOy@public.gmane.org>
2012-03-23 22:10                       ` Kees Cook
2012-03-23 22:10                         ` [kernel-hardening] " Kees Cook
2012-03-23 22:10                         ` Kees Cook
2012-03-30  5:05                       ` Matt Helsley
2012-03-30  5:05                         ` [kernel-hardening] " Matt Helsley
2012-03-30  5:05                         ` Matt Helsley
     [not found]                         ` <20120330050544.GA32299-52DBMbEzqgQ/wnmkkaCWp/UQ3DHhIser@public.gmane.org>
2012-03-30  6:14                           ` Pavel Emelyanov
2012-03-30  6:14                             ` [kernel-hardening] " Pavel Emelyanov
2012-03-30  6:14                             ` Pavel Emelyanov
2012-03-30 22:51                           ` Gene Cooperman
2012-03-30 22:51                         ` Gene Cooperman
2012-03-30 22:51                           ` [kernel-hardening] " Gene Cooperman
2012-03-27 18:05                 ` Josh Boyer
2012-03-27 18:05                   ` [kernel-hardening] " Josh Boyer
2012-03-27 19:13                   ` Peter Zijlstra
2012-03-27 19:13                     ` [kernel-hardening] " Peter Zijlstra
2012-03-29  9:56                 ` [tip:core/locking] futex: Mark " tip-bot for Kees Cook
2012-08-02 10:35                 ` [PATCH v2] futex: mark " richard -rw- weinberger
2012-08-02 10:35                   ` [kernel-hardening] " richard -rw- weinberger
2012-08-02 11:11                   ` Eric W. Biederman
2012-08-02 11:11                     ` [kernel-hardening] " Eric W. Biederman
2012-08-03 10:17                     ` richard -rw- weinberger
2012-08-03 10:17                       ` [kernel-hardening] " richard -rw- weinberger
2012-08-03 11:02                       ` Cyrill Gorcunov
2012-08-03 11:02                         ` [kernel-hardening] " Cyrill Gorcunov
2012-08-03 11:19                         ` richard -rw- weinberger
2012-08-03 11:19                           ` [kernel-hardening] " richard -rw- weinberger
2012-08-03 11:27                           ` Cyrill Gorcunov
2012-08-03 11:27                             ` [kernel-hardening] " Cyrill Gorcunov
2012-08-03 11:30                             ` richard -rw- weinberger
2012-08-03 11:30                               ` [kernel-hardening] " richard -rw- weinberger
2012-08-03 11:35                               ` Cyrill Gorcunov
2012-08-03 11:35                                 ` [kernel-hardening] " Cyrill Gorcunov
2012-08-03 11:38                                 ` richard -rw- weinberger
2012-08-03 11:38                                   ` [kernel-hardening] " richard -rw- weinberger
2012-08-03 12:38                         ` Pavel Emelyanov
2012-08-03 12:38                           ` [kernel-hardening] " Pavel Emelyanov
2012-08-03 12:58                           ` Eric W. Biederman
2012-08-03 12:58                             ` [kernel-hardening] " Eric W. Biederman
2012-08-03 13:00                             ` richard -rw- weinberger
2012-08-03 13:00                               ` [kernel-hardening] " richard -rw- weinberger
2012-08-03 17:16                             ` Kees Cook
2012-08-03 17:16                               ` [kernel-hardening] " Kees Cook
2012-08-03 18:06                               ` [kernel-hardening] [PATCH] Revert "futex: Mark get_robust_list as deprecated" Richard Weinberger
2012-03-28 18:33           ` [PATCH] futex: do not leak robust list to unprivileged process Kees Cook
2012-03-28 18:33             ` [kernel-hardening] " Kees Cook
2012-03-28 21:24             ` Thomas Gleixner
2012-03-28 21:24               ` [kernel-hardening] " Thomas Gleixner
2012-03-29  9:55 ` [tip:core/locking] futex: Do " tip-bot for Kees Cook
2012-06-19  1:41   ` Wanlong Gao
2012-06-19  2:24     ` Serge Hallyn
2012-06-19  2:32       ` Wanlong Gao
2012-06-19  3:13         ` Serge Hallyn
2012-06-19  3:21           ` Wanlong Gao
2012-06-19 12:23             ` Serge Hallyn

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.