linux-kernel - [PATCH v2] tty: Allow stealing of controlling ttys within user namespaces

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1390402431-6371-1-git-send-email-seth.forshee@canonical.com>
Date:	Wed, 22 Jan 2014 08:53:51 -0600
From:	Seth Forshee <seth.forshee@...onical.com>
To:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Jiri Slaby <jslaby@...e.cz>
Cc:	Seth Forshee <seth.forshee@...onical.com>,
	Serge Hallyn <serge.hallyn@...onical.com>,
	"Eric W. Biederman" <ebiederm@...ssion.com>,
	linux-kernel@...r.kernel.org
Subject: [PATCH v2] tty: Allow stealing of controlling ttys within user namespaces

root is allowed to steal ttys from other sessions, but it
requires system-wide CAP_SYS_ADMIN and therefore is not possible
for root within a user namespace. This should be allowed so long
as the process doing the stealing is privileged towards the
session which currently owns the tty.

Update this code to only require CAP_SYS_ADMIN in the user
namespaces of the target session's tasks, allowing the tty to be
stolen from sessions whose tasks are in the same or lesser
privileged user namespaces.

Cc: Serge Hallyn <serge.hallyn@...onical.com>
Cc: "Eric W. Biederman" <ebiederm@...ssion.com>
Signed-off-by: Seth Forshee <seth.forshee@...onical.com>
---
 drivers/tty/tty_io.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index c74a00a..558e6dc 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2410,17 +2410,32 @@ static int tiocsctty(struct tty_struct *tty, int arg)
 		 * This tty is already the controlling
 		 * tty for another session group!
 		 */
-		if (arg == 1 && capable(CAP_SYS_ADMIN)) {
-			/*
-			 * Steal it away
-			 */
-			read_lock(&tasklist_lock);
-			session_clear_tty(tty->session);
-			read_unlock(&tasklist_lock);
-		} else {
+		struct user_namespace *user_ns;
+		struct task_struct *p;
+
+		if (arg != 1) {
 			ret = -EPERM;
 			goto unlock;
 		}
+
+		read_lock(&tasklist_lock);
+		do_each_pid_task(tty->session, PIDTYPE_SID, p) {
+			rcu_read_lock();
+			user_ns = task_cred_xxx(p, user_ns);
+			if (!ns_capable(user_ns, CAP_SYS_ADMIN)) {
+				rcu_read_unlock();
+				read_unlock(&tasklist_lock);
+				ret = -EPERM;
+				goto unlock;
+			}
+			rcu_read_unlock();
+		} while_each_pid_task(tty->session, PIDTYPE_SID, p);
+
+		/*
+		 * Steal it away
+		 */
+		session_clear_tty(tty->session);
+		read_unlock(&tasklist_lock);
 	}
 	proc_set_tty(current, tty);
 unlock:
-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/