From nobody Mon Nov 20 16:58:10 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 4SYtxG4d0Hz51Y8M; Mon, 20 Nov 2023 16:58:10 +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 4SYtxG3XC2z4cxt; Mon, 20 Nov 2023 16:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700499490; 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=y7Z4/EH5pe/uVQgVOmd+AQj1l6a/Tzt7GjViKG6tNAI=; b=TLgbwmG/OlFkX+5p7yhk31DkTZjspP8eh0hdL3al5OY6pzDKMIAvKhbZH3eo6Q07f9eNDy D6psnQtZq/RaAHKG7878lcRx+07J8SwYk8vNqcehQuKVwqWLHMZfUau6Akh3Zf7hdCqMO4 KNmaiqxE9HSWCG5XB/wqpzCfNHc34lyROVVPv8DrwWj4OP14TxXEtdkJh+R+IbB4L6KOCy PObqB/ldPesKbSAqb8gBDlJfhHE2XZz9cDxZVQcg58AJC6JtHIk5xucymjNKFEZX+9RE8I jzqnvqhHKsUaNQS5n3HmfcLjuORu43Wimz/w+bnNxm5KY9daxkc/XOUIIFkHIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700499490; 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=y7Z4/EH5pe/uVQgVOmd+AQj1l6a/Tzt7GjViKG6tNAI=; b=lQ7tu1VpHlKrUcmJo0d/5xMxWGpL9bnPpYy2VlwEN7qg+c/hlVhkaVgSbWR/+PgPaBfBt0 v7Yaf6IfEN7wUvJO3OQ2VR49mJ+GceHudLacAAdBlMj80YyPq5gIGPTKMlxLKywJ1pF14Y 0GVkuoJupGSbxIpRbdzNpR2ixO5TcF4zqz3RIXzpAb39gwTA2yxtDiHCtfDq+FBpHWlytE +bck8HPACWoB5J6S4Bsq2HRNXTzfgCghqCz1MpW0xhyR0PCcERBS2hS59BLwELlC+sN+wY Tns5UELhyKEgqU2G8yy0WbWjUP5Fkjdl/S/P84k5nfiKPv3mSlsnbxZAbJRzAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700499490; a=rsa-sha256; cv=none; b=gjFK/XnfikB0L25dhBWqOtJ2HEr+YEcqbPUoLR/++ng1FY5a2OVVRODPrxI2DyyDnQFE9q F6SIPZ7wJuRCCM4WUAH417ewmiaO6edIqU9yP2zO5iTDqnFXfMA7uabRSjpPYNH0T6iVw7 KMmdBNynK9jGK6E2xafgaHim1Ca7HwYeNcRaC8YuLNDdjf4camomBMoe4AjwsbkrosktdE dVzj5Fx/3+WsApOOcOIhn6WVtknLot+pz+9yCB1kfZi38qwEHI4xQmEegERzX6NT/m+jRl N5bHWMyuPulNsSwnbI6r/HwOvC8UnMWAySBRsI+G63hp2a7gvCsUDqgVpS6+Ig== 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 4SYtxG2cY9z10TK; Mon, 20 Nov 2023 16:58:10 +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 3AKGwAtN074137; Mon, 20 Nov 2023 16:58:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AKGwAvC074134; Mon, 20 Nov 2023 16:58:10 GMT (envelope-from git) Date: Mon, 20 Nov 2023 16:58:10 GMT Message-Id: <202311201658.3AKGwAvC074134@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: 8647fe60b8c3 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 8647fe60b8c3cc03cf1d53d281f9306b7043543b Auto-Submitted: auto-generated The branch stable/13 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8647fe60b8c3cc03cf1d53d281f9306b7043543b commit 8647fe60b8c3cc03cf1d53d281f9306b7043543b Author: Bojan Novković AuthorDate: 2023-11-13 18:02:30 +0000 Commit: Christos Margiolis CommitDate: 2023-11-20 16:57:49 +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--;