From nobody Tue Jun 9 16:39:12 2026 X-Original-To: dev-commits-src-all@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 4gZZPL1n8vz6gG8w for ; Tue, 09 Jun 2026 16:39:18 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZZPK6Jf9z4JfP for ; Tue, 09 Jun 2026 16:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781023157; 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=ymTU2Xd0YUq/+2LAwG7rz57qoKJMAI9bYQbhp+pcruE=; b=pN81mWtDUihLTw+QtmrHLkodqq8ORdSgGpPWB3SlHICC870zBd+SWz8oAfVoqsc3SpwWqZ AdaRF/RimP2Vx/k+Twcf6eTB8Xcjq3/p8oOC9nFEg3JCblPpuBMnd0Nu1820CgV8I6XA4+ MA63wBmGl1xO6M9Mnx899WhREcApCYumKFATPrqrSBMEGTUKLZXNJb4n86VxFH9bD3pj0G miGEPHqWifaPkN4aJkaTsdcX3ehw/rRo+fduKRPF27MwEhthEmTYGLt1xKNEIbnSPcSC7Y ZZ26qMalNc0hUGFAVm4L51zMnfXlGrB1w4UCtEgFh0I3HJiwjRL8mOmfL5RW7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781023157; a=rsa-sha256; cv=none; b=n2L8vaXaXsLhz9b8c4sSbomRAUjbKkrYWbkFhLu0p30L0SjFrn+u4eBthBInZ5HkeTX0Vh ryj7XxccLTfSvcapAvvb8m7OW2+IqTv9lQFRxN6+tyDBIfjJyNSimBVvm/HHX7oA674BuV 10EIQSeUtN7KpvxPcwow3h+wIkGEsbQMdQsJg7m0xhNOyaSvSisMPcH1YVsicgZGk/gvaU mOzcUpSw9Ap6OHwXioh556m9xzI8V9Gl+TuLmUGTQEyN9iBPt0Mo+avC+WLyEssNzGSzHW o2F5FxXR80defY8RAOLczQteUcRPFdJRvplB7A9yo/XoYVo4MdVZcev0Gm+d/A== 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=1781023157; 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=ymTU2Xd0YUq/+2LAwG7rz57qoKJMAI9bYQbhp+pcruE=; b=Q4qE43bBZLJTls3BqsDwQlFd6LR+vs6cJZfMWW8d+edZREW+YnE+tefRsUwVbjGTZc+rJZ +3L0/ViN5nw4u7C6/7ovkYQXNU9QN/2f7sR3kCCHo8nFw5aXdX0FBy8jNlclJpGyZIKf4R 8Syr+f66a78+b13A411V+tCoPYQ9PR+6xlOzPtJ9Bzo8WF0ZKXGm4xvLZ3ykilSfcXY86q O96ONiLMw06arWuLfmbX9e9eU53W5CObU12jdUN0HVAddQSU8baKG5EwCFM0LuqzYXup0s jGsRoY/KcIJHXDD3zXT8j4OErwtk3zRHkcJk9g5np3JRZmimdaP0LNCBNwxudw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZZPK5cZXzhdJ for ; Tue, 09 Jun 2026 16:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2606b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Jun 2026 16:39:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c289291a6736 - main - tty: Add sysctl knob to globally disable TIOCSTI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c289291a6736c01dd68fb8459ec3801859b0a59a Auto-Submitted: auto-generated Date: Tue, 09 Jun 2026 16:39:12 +0000 Message-Id: <6a2841b0.2606b.19febe36@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c289291a6736c01dd68fb8459ec3801859b0a59a commit c289291a6736c01dd68fb8459ec3801859b0a59a Author: Ed Maste AuthorDate: 2026-05-25 13:59:40 +0000 Commit: Ed Maste CommitDate: 2026-06-09 16:38:54 +0000 tty: Add sysctl knob to globally disable TIOCSTI Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57233 --- sys/kern/tty.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 3d20d225087c..13147613f7f6 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -101,6 +101,10 @@ static int tty_drainwait = 5 * 60; SYSCTL_INT(_kern, OID_AUTO, tty_drainwait, CTLFLAG_RWTUN, &tty_drainwait, 0, "Default output drain timeout in seconds"); +static bool tty_tiocsti = true; +SYSCTL_BOOL(_security_bsd, OID_AUTO, tiocsti, CTLFLAG_RWTUN, + &tty_tiocsti, 0, "Allow TIOCSTI ioctl"); + /* * Set TTY buffer sizes. */ @@ -1651,6 +1655,10 @@ tty_set_winsize(struct tty *tp, const struct winsize *wsz) static int tty_sti_check(struct tty *tp, int fflag, struct thread *td) { + /* Check for global disable. */ + if (!tty_tiocsti) + return (EPERM); + /* Root can bypass all of our constraints. */ if (priv_check(td, PRIV_TTY_STI) == 0) return (0);