From nobody Tue Dec 05 18:27:38 2023 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 4Sl8Cb1b6Gz53JVR; Tue, 5 Dec 2023 18:27:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CZ5z4Kz3ZMH; Tue, 5 Dec 2023 18:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800858; 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=hjWd/iZOTmXXhJjrSl51Lwu89WMjz7RIRrf9uvWkdAk=; b=DnP0ipKiCCUvCkVIOCO0fsN7/h3Sbc8ccyEvXRWerenyp1r+KpsExwlTniuE0RAwwulHPy AVKlufaJ0BIplG1yoQneGFPK5Gj6TuzzdMZxsx76xgOx9uh/TTVL3rvh7HNeV53h7WuFuh yH0C6GWgIt4axz6Arlrx4KnDFRVudeeU0YKAorZtcGh2ErbopzLkjAJ2dE03+UyV6dBEG+ zZMc6I+MbEmcCuzvFmCrnThnAbHwbDO0kfUpXiVxmTzbEALHNRV/UVJCucrGwiXdZCRenb mQQUEj1PhLQwiL+LXyO7HLPWx+mBy48f1s+a3a0VXxpwJrZWYNGe8HONO1nb/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800858; a=rsa-sha256; cv=none; b=LWeQ4YxwksG/jpthWD5857PCWiEy9OFb04KuqAWgGcoXyafKgSZoCCzcXBfKtm4zb8nnqV rJtF2a15WZfwWU2ryMSmDpAv0LYpPlkBwNCRTj19NpnCyOErwXtYzKkWc+zhRSVjMfMQ9F Apy3vKfr+4GK4RsA8pyWAYYTccWc7dli4F+yxhfURLrpelR7pbMFzj4PASA5YBXDIRMF1f dC+tQ1x361KwiKRd7jwMYp48KS9PCwUD9L6xrd7WH/oTGyJdXf+iaUU0M2kWLrafVphW9R HQM/QaxPcPidamiSp0stAcVHyGkJyDRF72doUTYj2eeLBz/sq+t8ToJgGV63sA== 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=1701800858; 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=hjWd/iZOTmXXhJjrSl51Lwu89WMjz7RIRrf9uvWkdAk=; b=j0A8OtrZtoBZRbFJK5aRLiKZM2qw9zoYMNOc2mrAe0ANAcrmGF6OcvF6LvwFSFtY3rfy7a EauWgG03g7/vzEzu7HS5OXaVPPcSANoDQs3DaKlqd/4BVyo9AdLtBaP4HvQ7LJAmqJYxG1 iyZIa4sEutAKKUDYlVvLPCUBW8Zh7p17XS62mSlJ2j7W8DpIgNRasC2MmYFqIEyhPv7Szb kwEuSl4iGpmiiMhPoXgGbhdu5pqWkfpcPA7fOExm8sJGMlzOmbWgabliXb8iXet+uunlP2 xJ1UDe56vQmWoB4KZyDbMWZ4B8NjoycnX/11Wic7CjfZNtGLkxvDNmk3LLB+0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8CZ4xRDz59y; Tue, 5 Dec 2023 18:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRcuL009453; Tue, 5 Dec 2023 18:27:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRcmC009450; Tue, 5 Dec 2023 18:27:38 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:38 GMT Message-Id: <202312051827.3B5IRcmC009450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 31f6cfca851f - releng/14.0 - tty: properly check character position when handling IUTF8 backspaces 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 31f6cfca851f20099162352dac8d044857b2e1f9 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=31f6cfca851f20099162352dac8d044857b2e1f9 commit 31f6cfca851f20099162352dac8d044857b2e1f9 Author: Bojan Novković AuthorDate: 2023-11-13 18:02:30 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:06:29 +0000 tty: properly check character position when handling IUTF8 backspaces The tty_rubchar() code handling backspaces for UTF-8 characters didn't properly check whether the beginning of the current line was reached. This resulted in a kernel panic in ttyinq_unputchar() when prodded with certain malformed UTF-8 sequences. PR: 275009 Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D42564 Approved by: so Security: FreeBSD-EN-23:21.tty (cherry picked from commit c6d7be214811c315d234d64c6cbaa92d4f55d2c1) (cherry picked from commit ae8387cc818a0d6a2229ee049b671482e1549519) --- sys/kern/tty_ttydisc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c index c46579cefbb1..cb5bf672d040 100644 --- a/sys/kern/tty_ttydisc.c +++ b/sys/kern/tty_ttydisc.c @@ -822,7 +822,13 @@ ttydisc_rubchar(struct tty *tp) /* Loop back through inq until we hit the * leading byte. */ while (CTL_UTF8_CONT(c) && nb < UTF8_STACKBUF) { - ttyinq_peekchar(&tp->t_inq, &c, "e); + /* + * Check if we've reached the beginning + * of the line. + */ + if (ttyinq_peekchar(&tp->t_inq, &c, + "e) != 0) + break; ttyinq_unputchar(&tp->t_inq); bytes[curidx] = c; curidx--;