From nobody Thu Mar 28 05:06:21 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 4V4s2P3ZF4z5GCwm; Thu, 28 Mar 2024 05:06:21 +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 4V4s2P2xtsz4V04; Thu, 28 Mar 2024 05:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711602381; 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=r/xryZyWk8OWPxaShTKV0jOGBJj4e0QjncTQKKWKx5U=; b=U4/OYk29vevX+szc65cCc0cJfa8G0kQXAAa+HuUS+oiTryBfWou44hPWZIHrUJMiGsHqTI Y+d4lP/yJR9Duu+zZsGodx51xl5TFhuiv00NdFPa9ceFqgIb3mF5Xt5zhfxnxb+sqS0frs CVrwQwU8Xwue255RlOMxAQFZDxI6jzCJfnAMftP1GwL735O1aF6q7e5+2mZsF6m6rqy46r IkzfC/4qVv+5mEKds/snfRL3S6GYCUUuePoPqQEMX9LFyKGp/liKpSBnpODNe1K44wQ6x+ b1uN+Zxk0KvRlMo491dyDOAca+2IZhhw8TBqqNj11NjMLOKdkV5fUF+EzSbVcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711602381; a=rsa-sha256; cv=none; b=EYaCa6LptR2WUxE2zAkGaVBgeYZy0eWlDkPhUi7wvb5XDX2kP0B86/DIlW697/AOZXZhCu 0I43j3islFv9dtc3OXVpS0Xl+8kXspV6sidsNv9TlWjSCL8oJRgp14NFhNzD+9v78+pexY ZayTVm+tM3XXYTQlwR/rs1f7VOqpsWQezI3shML72AXm3hjoB+836U7++W25iukc37hVjp 3SMvlwbH9YCDcV5Uz/pF1wsZsgvwD+GwxAzqSg8v7Bh6/a1uwFZvvQ0km1wE2o/tISTK3y 7DX+SH3psAZkD4aK1zMtPerODwBU3EDuKrz4i9J24RERoDfVSZ6Iy+gti5ukLQ== 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=1711602381; 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=r/xryZyWk8OWPxaShTKV0jOGBJj4e0QjncTQKKWKx5U=; b=Z5gyAkHKEqPkydq88r6vFkhc6T0IiDeHScB+BOWDASgJr/xXC3rxjeTkCRCYm/30KUDNfu Zaupfgi/n1X+jLL+HLoKyrovmEFMyoRpfDc2Cl7mR1ti+ZGGk2pSbVrO1eAn6a5zDSC7QL b8BS3clojwT6JkHgMV9gqIEYHkMtZCwQ2ENtqlzBzQaz+vDq4h/ouOfq2NsfCkr09re9Gw efFRcvqpeIC6SvR7plwTEVsNkD4wM6A8SGsY7pwXz4B37Z6QG23ZRJLmpYZji90MXLGTiR 7uz0yUXbBM3R9QIxMBCYC0pNLXoCkpODThZRuyyxhbxGL49gwXrhO1Md0m0gPg== 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 4V4s2P2XpKzF4f; Thu, 28 Mar 2024 05:06:21 +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 42S56LB9098980; Thu, 28 Mar 2024 05:06:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42S56La8098977; Thu, 28 Mar 2024 05:06:21 GMT (envelope-from git) Date: Thu, 28 Mar 2024 05:06:21 GMT Message-Id: <202403280506.42S56La8098977@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: a3ec3054762f - releng/14.0 - kern: fix panic with disabled ttys 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/14.0 X-Git-Reftype: branch X-Git-Commit: a3ec3054762f0e7bf2381a7939e62c5e43fde935 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=a3ec3054762f0e7bf2381a7939e62c5e43fde935 commit a3ec3054762f0e7bf2381a7939e62c5e43fde935 Author: Ed Maste AuthorDate: 2024-02-26 15:38:45 +0000 Commit: Gordon Tetlow CommitDate: 2024-03-28 03:12:16 +0000 kern: fix panic with disabled ttys PR: 277240, 277329 Reviewed by: kib (earlier version) Fixes: f1d0a0cbecf2 ("jail: Fix information leak.") MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44086 Approved by: so Security: FreeBSD-EN-24:05.tty (cherry picked from commit 975d7730828a8bde28c2a0092b6e95c4c4e22f34) (cherry picked from commit 8d22744f5be165a2a82a2a204789e44bbdc5a2ee) --- sys/kern/tty.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 673904570b86..df42c08d949e 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1312,7 +1312,8 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) struct xtty *xtlist, *xt; struct tty *tp; struct proc *p; - int cansee, error; + int error; + bool cansee; sx_slock(&tty_list_sx); lsize = tty_list_count * sizeof(struct xtty); @@ -1325,8 +1326,8 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) TAILQ_FOREACH(tp, &tty_list, t_list) { tty_lock(tp); - if (tp->t_session != NULL) { - p = tp->t_session->s_leader; + if (tp->t_session != NULL && + (p = atomic_load_ptr(&tp->t_session->s_leader)) != NULL) { PROC_LOCK(p); cansee = (p_cansee(td, p) == 0); PROC_UNLOCK(p);