From nobody Sun Jun 14 20:08:41 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 4gdkpl0lRZz6hLlv for ; Sun, 14 Jun 2026 20:08:47 +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 4gdkpl02bCz4QDT for ; Sun, 14 Jun 2026 20:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781467727; 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=i36TmVtNJhf+thgwKCK9rhgB403ShPAhM87W7zSTYng=; b=XjoBD1SstK4PPqa+VTHmL9Bm0pF/cJb1Xhmni6+QKipQc1Dfyyw36QcK9tW/os0Sxs6U9L Cojj0URZQDWlEts4S8MZl9rJ9fvqyVrzVq8KbkR9BM80ScezxvAV3UOpUjCZ7LZReGzlPC GyYQpGv2osmCi/7moz0eLxCS7BXtHlBFxuCLK9oMR2ekXTt637ATVmwrVd3Zbye78KZoKl iqTVPLJxRTOJeoBVLwzDODDstb9SPOiNEmGq2UcKLX9YBjOjM544F7zy+7ddocXQb9nspl 3n8zJ22hRFw5uHEe4sicH4IjDBc1819hmZp2qYoh2ZtUY7QqE8DM+Ly1QW2SbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781467727; a=rsa-sha256; cv=none; b=v8QsI+xqElIQLxvmNg/2KpkSDLtR2Wt/GiNwoZmkK7kG5JRNQ7CBp5gJWs4rSCPVLCwgim Edge+Vy6R4TgsccuZYG74wY3MuBGdOQEp93tPS7j0/qRj5nZfZTAO6im5cZ+1TE4UTu1ZL tXrvLedX6PqW4JlJ4eDfeHWfTsyOJUAiS8VXI8lmx7/Cbml2bR3Ah5RQozH4oL7tHK0f33 2t8IA/QhB//FrUgInvEmJXf7Xfkz+iqYwIU1LFB3PeKhHS5+DJrs42K0aFugxgsQJzQeNi q8GUBPeE3zbgLjdD8mZO8fQ6+1bKvEEKGssHacWV7LrsI1lkXE7lxONuqot3jw== 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=1781467727; 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=i36TmVtNJhf+thgwKCK9rhgB403ShPAhM87W7zSTYng=; b=QHKw2RVXjL55EGhQVRtJzfFbEIT45btZM+/9gQg1ScshHQQSArraetxCaJXk3a1G41gSI2 So5ck0yqCDRt0oE14jTRRWWBCQ7K0ddtdL8r6r2nFQkODDVnaohGDJFIN8GUQiupvNGaYg VMYWGYEhCxmNDyYqXbqoZ3qh/N+edBJPayZmc6MyRpZeoJTw0BxQD6YV1oif1YDEz/x8jp 2+fol1ZyMbHbQhL2qFTaMAYNsrT7M1vhSEVcEhvq9KYcVua3JzgQkC6PDOiDB9wdP7DnuB GN3QGO8QrFz1sGMD3mARZo67vxfmjFkgdlXBDBnX6NTuMAT8BqgHNNcosG3vfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gdkpk6lncz7vg for ; Sun, 14 Jun 2026 20:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 332c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 14 Jun 2026 20:08:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 16532b220c9c - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 16532b220c9cbd9fb0365a80a23cc435003e9986 Auto-Submitted: auto-generated Date: Sun, 14 Jun 2026 20:08:41 +0000 Message-Id: <6a2f0a49.332c2.504001cc@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=16532b220c9cbd9fb0365a80a23cc435003e9986 commit 16532b220c9cbd9fb0365a80a23cc435003e9986 Author: Ed Maste AuthorDate: 2026-05-25 13:59:40 +0000 Commit: Ed Maste CommitDate: 2026-06-14 20:08:29 +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) --- sys/kern/tty.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index afba05ec27b4..5f6afa49b70d 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, allow_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);