From nobody Mon Nov 20 16:55:14 2023 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 4SYtst5WJgz51Y9P; Mon, 20 Nov 2023 16:55:14 +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 4SYtst503xz4c9w; Mon, 20 Nov 2023 16:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700499314; 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=xrq7su6C6dzrjgWiloy0XKmydrM4Tn5rIdQh0he0FMQ=; b=f+PZxKvcF618i4olhxUw44eguHjWU0vCxgRop8SKiYM9j4DuurPgpCAj0NHFMiu9JWigi3 tFEWhn5BTf8UWoGRh6pPD/+Vn3TY3MlgDUR33S1IuMl6An27V9BFN3XLymZ9aKPi0x2vpw cHZeeUsNRKinloXCqfQqOATiNBVXRHhaOGwcSoEioUEEwnYXc2meYlsg4iJsFBH6v4cp76 lmh+otL/4N+x6SAh4hTtTKtBZEYbxOCN1sTTY7pF6xVea8c2IT0uVLPcuPzfKb5weFLkUv 9U5CbpS9zb/gYuizOgMkyUINVD7kqis48ivEM+fzPlJNAbktb1zzWphMUZ2pJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700499314; 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=xrq7su6C6dzrjgWiloy0XKmydrM4Tn5rIdQh0he0FMQ=; b=uqhskkZJIDKzGZyl83/IfXmRkeiVDWOeI9mjMyvjATw+bI38xk8bJHzfnY8ck/VqhAYaG8 /vKIyTvNSXM9AfMv7owQ9xgNT4N/xpHp6O96ylexhkc2bgDRh9VtfNV2EsWvccBo9jdzFU bkngZlFZFLPT8jDl5OjDSQooXrFrgv2HiSdEkAnayAVLlMdr/iL9gO/Z/3WZEGcpftH6o7 eA+ylYFOTQ9974NjKH3eBTi18Znepa7ZC6XEkTHCc2lBFH+e0oCuEeVLM9sRksShMO7sp/ P7DYysKlL0tu80ZOEpWdTRfqAS2WSvtcSOAnnKY8xtnj78phG0IAs2Ber2OwPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700499314; a=rsa-sha256; cv=none; b=jF/v2RrJ4YSQmOkmg83NoN3bnTabegXx3HjyWH8Q8ZnMUJLLgLFMLaER914mCanf98KHww V0R7csbmlhRlCdsT/hVcb5ms9CH5E7TO0HvFT6leq5ZyN0Kv6ZRYYoEITSK3HE0Ci4dZMb adcw7ueJLPynZbdumv9hDhnbImCDJqhJ7yOyq8/ve6ooZoLoeVKSLE+I0ttsNIWR60zdqu ZT9n0b6X1898UL2EQlwfAe3OFB9N0JzqBUQDze8CTsEUpt/AY4JbIwg+odbxH4c5TIrxdI kagKkwsdQCXeMudGYOPxphzxp5DXKem7NndFA9wmrzCYzH7O+vWVifkJdLf+Fg== 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 4SYtst3h0Vz10FG; Mon, 20 Nov 2023 16:55:14 +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 3AKGtEqi073360; Mon, 20 Nov 2023 16:55:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AKGtEQM073357; Mon, 20 Nov 2023 16:55:14 GMT (envelope-from git) Date: Mon, 20 Nov 2023 16:55:14 GMT Message-Id: <202311201655.3AKGtEQM073357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ae8387cc818a - stable/14 - tty: properly check character position when handling IUTF8 backspaces 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae8387cc818a0d6a2229ee049b671482e1549519 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ae8387cc818a0d6a2229ee049b671482e1549519 commit ae8387cc818a0d6a2229ee049b671482e1549519 Author: Bojan Novković AuthorDate: 2023-11-13 18:02:30 +0000 Commit: Christos Margiolis CommitDate: 2023-11-20 16:54:54 +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 (cherry picked from commit c6d7be214811c315d234d64c6cbaa92d4f55d2c1) --- 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--;