From nobody Sun Jun 14 20:08:41 2026 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 4gdkpf2hvJz6hMCm for ; Sun, 14 Jun 2026 20:08:42 +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 4gdkpf05lbz4QD3 for ; Sun, 14 Jun 2026 20:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781467722; 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=ES6+ODO+FttedGxyULoOoTKw0K9PA7WklsWBdTtCd6tM4H7JGLuyWsNFR92hdDIaYsqSRz takVKyxuQ3ImMEN4q3caHyqz72QAHQUP7x/4MkCMpegCkhRq/+08Tr785JjkhRYiHx5r/9 lNUGK6Jc+doDCLDk3r4SUaknCX8lUwd5a4387FCz67xPJLxghbH69SgPQRZRMAptOdfLnJ Sdzi/MWZKQZuU9TdDWTl8tR0ap1cfYQJfJKRI60uls/60r+aaN/nN9cWNHlOMjXls2g5tD lkhIjZtttq42ToBkhCOy9Rt0plXhzu0jG8X0O51sATZJJ7qrSUmAsW1ho1Cx7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781467722; a=rsa-sha256; cv=none; b=L6tbwjtmy5VmgQwQu238mE9N033/JL1sqtHhgUOq2hIaJ7JN9iVE4S6+fRFukNxLMDekXP 00sLzhamyCYpaBq/xFWpsz70tbjwm6M2qji/kjOjHoOBeeDkHLkl902oEZJHKIci1SqwSL EE0Elguxj1pg1k7CDZLkkFRe+NZjJ3uLcywdGE09W6mMIINA46lOGRbyGMuKoMQJsyfRds kM6cZ5/BgIt/h61UaRrtlm0Eif+deI9/uMiYT/eUJ/kLGn5EIPYej0f88h1YUaiawfUerv b04oIZaaiGHFDGu+HcFv4ztaJ0IMCKkxpNFdSfbuTcbJJbtbkvfiUmMxmZd8aA== 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=1781467722; 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=TgjnYq7UaA3sscfxaDV6EORDA0oCiQK5XZoFZLxBOEtMV2Pb5Fv2zg/p411qP3CSEf8/os /AVMpy2S8V5Hs2fYRzk1Kgo2W73Bf3cqiOom63MDu8Aoifzf2AQETUkjhfmpQ2HBK0KDAK lpjcW8YVrSNifI6ThBSFyfRaxIqvnvXI3UJpLEk6fVU/jVPEIAFaoD/aXYVUE1kmadRkue f5NOOBZgRlPVxdwh3I9e2JYZLz7FVPhA4lI/VLlwuKz7gkYMENWt7viNeux37qvJvtf2l+ iNam8XUD46O3ELCjLX0zJJftjG611P4jT043vpYLeK/AxTH6/3+hf5JsA+gBjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gdkpd6PD3z7tL for ; Sun, 14 Jun 2026 20:08:41 +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: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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);