From nobody Wed Feb 14 06:06:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TZSP61YqKz5B53h; Wed, 14 Feb 2024 06:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZSP52rxSz4RZS; Wed, 14 Feb 2024 06:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rLt2Y1FTPVk/G3vwlbChJ+i1lGKNAHpq/K2BNvmgyBw=; b=TIM/20MCIAbeYMxKnKGM37rvJzQmFKLy+v4D4fcbZj6dx/EYIa7l5ism5UyskSeAofGXIW 0r7EXzvxQZqIJyPhGjI7BFleQDuqdyytfa9U7cuh8LZizqM0B9v22zfUcqvNK6PvAww5bk sjQEW5N8U30Ox0G864rqqCcM+0qhqp323vf2VcZmMFB/4dxVH0Eso5iqjguh1FiFd9qbxb 0St5Tf5rxgjWEdcUgFeU0cTj7/E/1gAEiROhzqtQPiXwjbM424Kq+JUwlEkaqe1FhYeFu6 7/zBY9HN5BNwjJLUFdTyw8zNoW/7IO9KXO4j2vfeSAovXNcBN35B1TyrkpLpwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890761; a=rsa-sha256; cv=none; b=MYPWYzXVoc9V2msQiNL2IgDFUqyrye8Gc9RG9xK54FHe129928p2ZKEgF+k11kYqmmpIda qkWOhkvXMcUoe8Y7gjTOZJkjCQbHF5x/fY5Qv/DYrdEwhL54tCxDpbPGybx0dHTBCvNnjF wAnIuQiSZiDjupJSFibsVGaIQZWfP6qR9TRYUPGD6fryiUl7VRGWD4Z6GP726M+PbSbVKQ Ze7Vi/DuH939P/4wk2J94OweFfbJaJrnXJTtLSj4FT5hzUCvBvclQPvCLgpWVqTtvnTnnK xsiCioi/kTjqP10OQ1RqT6WSoVjZk8g/0GUxUnJjGc7pY+/FnTNn9fJc4MgJnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rLt2Y1FTPVk/G3vwlbChJ+i1lGKNAHpq/K2BNvmgyBw=; b=jSmC9Gv0E5VohmRTOrrZvXwlAybNnHtsKk1zIyUJXY79vGfIrp936yeIXXQiL5UDyMGIse /ybaJsltWAV+MIXSa9UCdbYI9G57/KCw9ZP79SlE5T/73Up3VOOT5JMRkLg3JaWOAgpknG 2f6RzhNqfBBKH4XKpmqmNDPrRjuS0AyLvm8ejDYF65sOGZnFQPSXtWL/qDQlTimxAf0eb2 RxpaPjA6kKtYxwB3hJhmlUesOLjH1nEHizejO+7rJ/n7FwVb7xyyty5afmwGbFTq8F2U3y CmI00GcVAdwsxSNUzbF0AY+JlvyFX00uH4gx6uEvd9VKJNDobjOqRpdUnGCqGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZSP51xkZzmtt; Wed, 14 Feb 2024 06:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E661ui085269; Wed, 14 Feb 2024 06:06:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E661ml085266; Wed, 14 Feb 2024 06:06:01 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:06:01 GMT Message-Id: <202402140606.41E661ml085266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 17257e6e9a23 - releng/13.2 - jail: Fix information leak. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 17257e6e9a233df4b18116b8cec98537f8bb0e20 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=17257e6e9a233df4b18116b8cec98537f8bb0e20 commit 17257e6e9a233df4b18116b8cec98537f8bb0e20 Author: Pawel Jakub Dawidek AuthorDate: 2024-01-17 17:43:55 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:48:47 +0000 jail: Fix information leak. There is a lack of proper visibility checking in kern.ttys sysctl handler which leads to information leak about processes outside the current jail. This can be demonstrated with pstat -t: when called from within a jail, it will output all terminal devices including process groups and session leader process IDs: jail# pstat -t | grep pts/ | head LINE INQ CAN LIN LOW OUTQ USE LOW COL SESS PGID STATE pts/2 1920 0 0 192 1984 0 199 0 4132 27245 Oi pts/3 1920 0 0 192 1984 0 199 16 24890 33627 Oi pts/5 0 0 0 0 0 0 0 25 17758 0 G pts/16 0 0 0 0 0 0 0 0 52495 0 G pts/15 0 0 0 0 0 0 0 25 53446 0 G pts/17 0 0 0 0 0 0 0 6702 33230 0 G pts/19 0 0 0 0 0 0 0 14 1116 0 G pts/0 0 0 0 0 0 0 0 0 2241 0 G pts/23 0 0 0 0 0 0 0 20 15639 0 G pts/6 0 0 0 0 0 0 0 0 44062 93792 G jail# pstat -t | grep pts/ | wc -l 85 Devfs does the filtering correctly and we get only one entry: jail# ls /dev/pts/ 2 Approved by: mzaborski, secteam MFC after: 1 week Sponsored by: Fudo Security Approved by: so Security: FreeBSD-SA-24:02.tty Security: CVE-2024-25941 (cherry picked from commit f1d0a0cbecf2c688061f35adea85bfb29c9ec893) (cherry picked from commit a376108029a20f4ce51476d98f2483a7008ce7b5) (cherry picked from commit 41ac0b4ce00bae061164384f23356a4df6e0e695) (cherry picked from commit 9bff7ec98354a76c171905ce9530f85685725ee7) --- sys/kern/tty.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 8dfe5e93780f..22c4bb6dffce 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #ifdef COMPAT_43TTY #include #endif /* COMPAT_43TTY */ +#include #include #include #include @@ -1309,9 +1310,11 @@ static int sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) { unsigned long lsize; + struct thread *td = curthread; struct xtty *xtlist, *xt; struct tty *tp; - int error; + struct proc *p; + int cansee, error; sx_slock(&tty_list_sx); lsize = tty_list_count * sizeof(struct xtty); @@ -1324,13 +1327,28 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) TAILQ_FOREACH(tp, &tty_list, t_list) { tty_lock(tp); - tty_to_xtty(tp, xt); + if (tp->t_session != NULL) { + p = tp->t_session->s_leader; + PROC_LOCK(p); + cansee = (p_cansee(td, p) == 0); + PROC_UNLOCK(p); + } else { + cansee = !jailed(td->td_ucred); + } + if (cansee) { + tty_to_xtty(tp, xt); + xt++; + } tty_unlock(tp); - xt++; } sx_sunlock(&tty_list_sx); - error = SYSCTL_OUT(req, xtlist, lsize); + lsize = (xt - xtlist) * sizeof(struct xtty); + if (lsize > 0) { + error = SYSCTL_OUT(req, xtlist, lsize); + } else { + error = 0; + } free(xtlist, M_TTY); return (error); }