From nobody Wed Feb 7 05:21:58 2024 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 4TV7lV4l3tz58nnj; Wed, 7 Feb 2024 05:21:58 +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 4TV7lV4Fljz4XTT; Wed, 7 Feb 2024 05:21:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707283318; 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=0blYLGSAPFOPoTc4vrRg03d+C2418OAc9p1zV/lAmJ0=; b=J/Hd0PmXcclJMk0U4aPpQS8S52cZXOpmmy2GCrvQ03MMkJAe6a+oKE14yfRviOWEExfWrc Kuu0eSWHSDEvHHdmMSw5ZGnN3ghHG6PprnzBX2glhnvWHnmHlaF4uybH+uAFLMLu73M87o KGq6m2Dzy9LExDm1JltzlitPe3n6/12muGNBomJhoPAIwqmnGOqHJT8sVuIsjq2QoVntWU Iysz5xGLj+NE9bxd1Rtn/raxAf8yspGdfWGLYMPnj4f0GhfMdH5445l3wAukQySUAqGy9u a5Svgrca+G9+Vc3t/ND/bvxF/TBok3pqxnpx4zcaXIHXNzHYrW/7Bv/a2bUWwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707283318; 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=0blYLGSAPFOPoTc4vrRg03d+C2418OAc9p1zV/lAmJ0=; b=BlwzyU2Iyi8r/1JlF7+vqG/Q2veLvQMJ24t2HhNYBqJBaqwNjkQ3H4ZAnbjc9ayXSD2Y3l yaLTsLwxnqachVF/PcfTiUx8lPD71WrU+2/om1x7S0MSNCkwQbLn7pnQYDMRAlKQvCyUAD CrnAMiAiYkmVLclh81jX+OnQGTAwmXIrjkB58a3UkBQtRI++7hueqpN2V6i5CJFnTXsUSy lx/Yc3wajLFrb77sLc7x3erooDu+nXVRXwA5j+Cmc/0kX/jfEa8QErinv2bdIW8DevC4HJ dc0mNFzf/VHcXuSY1giKiaBj1m9YdQLaGoIsSxBDiL2P8jVt+0HGKZQeVryBBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707283318; a=rsa-sha256; cv=none; b=bNxmMC3Tto8GeyLSN1yLlaXiqAoOwI1s3/L+Pq1Bq1m45ICAUrM/2Vn830Bf1TCpPM9w/p FBYJy9p1rIk+BHlRb/f1Gy2J9E2Nqur0JXYModh/s8v50FjB2s3bTjMm8JS9ie3OjRNiT+ NAdHrM/awWR5gzhxIzQy+TYi7r5gqV+irqoY+QKVD6g5zkd1r2MfDY0WqDUpRl/MNnWKH4 8XPBPCqomE350vy01QOmR66WWKcZ+9BJBzP80LZjSzMICMPZX6gMneA3SoCt3uDwDGO9xM JJmQbz8eKlGLkpMjjFAUpmKDNjrMnw/1Cc1HS14gnXVe32l6eJj4ro/WbApIOQ== 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 4TV7lV3Jg1ztcT; Wed, 7 Feb 2024 05:21:58 +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 4175LwYn070847; Wed, 7 Feb 2024 05:21:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4175Lw71070844; Wed, 7 Feb 2024 05:21:58 GMT (envelope-from git) Date: Wed, 7 Feb 2024 05:21:58 GMT Message-Id: <202402070521.4175Lw71070844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: ba90708fb116 - releng/13.3 - kern: tty: fix ttyinq_read_uio assertion 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: ba90708fb116a6587a992f0a14fd807f44b72309 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ba90708fb116a6587a992f0a14fd807f44b72309 commit ba90708fb116a6587a992f0a14fd807f44b72309 Author: Kyle Evans AuthorDate: 2024-01-16 02:55:58 +0000 Commit: Kyle Evans CommitDate: 2024-02-07 05:18:59 +0000 kern: tty: fix ttyinq_read_uio assertion It's clear from later context that `rlen` was always expected to include `flen`, as we'll trim `flen` bytes from the end of the read. Relax our initial assertion to only require the total size less trimmed bytes to lie within the out buffer size. While we're here, I note that if we have to read more than one block and we're trimming from the end then we'll do the wrong thing and omit `flen` bytes from every block, rather than just the end. Add an assertion to make sure we're not doing that, but the only caller that specifies a non-zero `flen` today will only really be doing so if rlen is entirely within a single buffer. Approved by: re (cperciva) Reviewed by: cy, imp (cherry picked from commit 09a43b8790bdeb97fbecd3ea767c2f599eb4a4d3) (cherry picked from commit 81ef0de636ff8ba0b8057ced593f2ab92597b1a6) --- sys/kern/tty_inq.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/kern/tty_inq.c b/sys/kern/tty_inq.c index daf3bde77712..0bf7c2fa5b5e 100644 --- a/sys/kern/tty_inq.c +++ b/sys/kern/tty_inq.c @@ -165,7 +165,8 @@ ttyinq_read_uio(struct ttyinq *ti, struct tty *tp, struct uio *uio, size_t rlen, size_t flen) { - MPASS(rlen <= uio->uio_resid); + /* rlen includes flen, flen bytes will be trimmed from the end. */ + MPASS(rlen - flen <= uio->uio_resid); while (rlen > 0) { int error; @@ -192,6 +193,14 @@ ttyinq_read_uio(struct ttyinq *ti, struct tty *tp, struct uio *uio, MPASS(clen >= flen); rlen -= clen; + /* + * Caller shouldn't request that we trim anything if we might be + * reading across blocks. We could handle it, but today we do + * not. + */ + if (flen > 0) + MPASS(rlen == 0); + /* * We can prevent buffering in some cases: * - We need to read the block until the end.