From nobody Sun Jun 14 20:09:49 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 4gdkqx5GLzz6hMGT for ; Sun, 14 Jun 2026 20:09:49 +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 4gdkqx4dXFz4Q6M for ; Sun, 14 Jun 2026 20:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781467789; 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=D7rLwOx5lAYgJJqc5/1OGwThfwlPdoY4Ed+YxXtmHWY=; b=OkHLriFiEILSSjx/9IxT/uQhGmZ7Z5d5KF3Spy+FHqVOsYAfOzONN7suwR2dnnYpFBkcNn WiJ5BZknsk9rHuLYkgSyZ+Zsq2T7jw7Q+5h6E2pQDCTLAIlSHYfH/8J0AFC28mC/dE7qj9 D37YCWxN4ZoYgpvk8fBoMnqzbGMG4lunrCNf5zUxS60pKvFkce3FeCDN+GLTRuZvPduXtX 2iQiRF+rmECm5NPMcwcP3X02ppum3VKb9nFltg1EsXjlR9TfByAZODLzpCuU8YsIW0FV1e yvJbMh76UzeSgSOmdNvS+NLbr3WGIRTBruxYsBIdLTTKxZpr/5bdYl85YYnC+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781467789; a=rsa-sha256; cv=none; b=PjwSxRtBcuYu8u7+XJp/pIVsi3D9IiYJ9mOFKwqY3WJTlTxCiKEvDmwW/RFa9lkLiw0UfX J9ENW5niUXXOp4/1C0S/OiA6CWr7tTBqFiexfiO1a4AF7kU32B8QJ7pIhJjaVgJbGie7tm HFz/yupEaehCkuKypWMlOSb+aVv/bOEibhZoPPjf9alLRD4jt5uylJzmRLuhke8TMhcoUm 6vM/1GJLfUo/3S4rP6JTVzzP0eLVFVWYxgdvlApKSxzxazm+4KXjbaUYdrRESBs2Nz64fD AlIolMwgnUhHlZGexm0v42mCmYVF2ULEUVZLExakrn0mG2+okh+Nd3NhZM7aKQ== 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=1781467789; 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=D7rLwOx5lAYgJJqc5/1OGwThfwlPdoY4Ed+YxXtmHWY=; b=Zuw2+NqcjLYeBCL4VwTshzML5J80QS2rM3YnHcdBxiIV0WT3IgSBB5RAuqiWO584MpUkY5 O2cy36JT/Bra32N96OSJoorZVkLvF5QO/p9BW2Mu+KtL+FzKhBPn5zu6CR0YECpItZ89YA ++ljWj6wyEwCCd6jqQS4B1Oh6HblZvv2L2hDepunlbXuWmhVBp2HUFe6t0TDZ/zlsR79Lg H13xX+Cso+eLYZ7qt0aa8k/+4PfJErQrKz2ZGu33vsslMrg/C4lmgysSJo5Fg2sQpSDtgi 64upQkIenIZB4bdMOBKVA/m35YVcWyMkK+D5W2BAlucgmqYRv1UqFL3GpF/vbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gdkqx45Bvz7yl for ; Sun, 14 Jun 2026 20:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31b57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 14 Jun 2026 20:09:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b5cb2739b8b5 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: b5cb2739b8b5d92e435693f290d0b30bd989460a Auto-Submitted: auto-generated Date: Sun, 14 Jun 2026 20:09:49 +0000 Message-Id: <6a2f0a8d.31b57.1a58da80@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b5cb2739b8b5d92e435693f290d0b30bd989460a commit b5cb2739b8b5d92e435693f290d0b30bd989460a Author: Ed Maste AuthorDate: 2026-05-25 13:59:40 +0000 Commit: Ed Maste CommitDate: 2026-06-14 20:09:31 +0000 tty: Add sysctl knob to globally disable TIOCSTI Reviewed by: markj PR: 293485 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57233 (cherry picked from commit c289291a6736c01dd68fb8459ec3801859b0a59a) (cherry picked from commit c94b8eee5bcb5f9d116cce9c831933115cfeeb19) (cherry picked from commit 16532b220c9cbd9fb0365a80a23cc435003e9986) --- sys/kern/tty.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 508fa10fdd62..3bacbde3d1b0 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -102,6 +102,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, allow_tiocsti, CTLFLAG_RWTUN, + &tty_tiocsti, 0, "Allow TIOCSTI ioctl"); + /* * Set TTY buffer sizes. */ @@ -1650,6 +1654,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);