From nobody Tue Jun 9 16:39:12 2026 X-Original-To: dev-commits-src-main@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 4gZZPD5RlJz6gG64 for ; Tue, 09 Jun 2026 16:39:12 +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 4gZZPD4ggpz4JRN for ; Tue, 09 Jun 2026 16:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781023152; 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=jyY3dWF96qLMtP6l3tHtoDbwYug9H1yU2VpnyLOPn4Jk0qcbX/HZ6UYMohOllbEHIk/UZN uKM5vLeuJaZoF6yvfuj3wl3Z55ZZESB+8JBbelR9FNvy2Mm1ba/vWM7drAhmOaLS5nvle5 D5ubh2RDY1uuSpXgfqRw6J/wBnAMZ8WzS0Mkilobc1QxrayAUiJe6Ks5Mo72eu6QO1DRiE NqTGXu8HRxDbKQkF1Mjl5S3pbQf4VjywtD7BDaVCGEIXNNM7C6AmIWakDgwr5CGdCHfJm5 N/8tmSPiZWZwGQNue2En2H2J1PmnEojolVAorWa/F4X/nL4vrb5EnQi40fmA2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781023152; a=rsa-sha256; cv=none; b=KgpAGbbVqYxRPf9zNoUp+h0wCZf7roZLKMwUf8IyYFx/QIYyfefqwcIHSWDlOGzidzzz2s C4OXFIMJeXNKmUHfzTn3AHYyGXOEboHeEaE399eADZab49ibvyi/D49QApo8w+WmixH+fr sG3CZQ2YFA33v7XlR0vZ6Mc9Ad65uEN+ds2JhLFIblB3AiRD3zj0OgHWTXHN2sJQlVgueR sFbSrBSDNUemPL3idniK8fIjfWV01u9oCrethyFPjWDzHFwVBJkmzXKeVa3zSYDeuCYgcg 0c2HpQiJWYka+ZpUC/RoJCs7yVKm8ppBldDYSjTEtImypMFDqmZI09SdVWVALw== 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=1781023152; 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=m0fZAMps2v5/5jGl4bn8CFtBaGnjbSCVQrQXV+L6SDq6Cp3uwClDvOAOjbXHyCWa68jNcq b9AjMd+dM0eHAP4+tpITz4P5F2fHH5iyUirKwaNt7AP1q48SQqldmleVzWYAyXDbwjDXjV oTrL1GNEbohjFb2l/DljmUbzzueJMyMsgM6VN1h0sfgQxfgB3A6YxZRLndicy1Dcp8E5rE 2+GDNZzVPv0buASD965WmJ8eHYhzHhZgX9mmvjrOTSEFMxDcHlKQ7vY6zimG3DYk8tzxhP D9/gT/FrjMc3COTaBy9xGH15fi/yc5Ikv+38CzLFIExe45c4wclv/4JWDEG15A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZZPD401Gzjnb for ; Tue, 09 Jun 2026 16:39:12 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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);