From nobody Sun Aug 11 23:04:21 2024 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 4WhtWT5wb6z5SRPy; Sun, 11 Aug 2024 23:04:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WhtWT5N0hz44sR; Sun, 11 Aug 2024 23:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723417461; 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=fjQDm0jkAHApXFkkuTAb7t31Ztqty8gfvuGS2TJuCHI=; b=yheMym7H8fyNtFZa34vcKyOhbdtO8G0mawAO2uhTZq6Vjr5YvRXiNGNkymu0urYvdHzxIF hz+5n3kPuBGUN+6IH5mHjIwYpLgPcdLPPQn1fhyqkkKQes6ACKC54HUdzlKBC5hiM5DnHG UTc+2w4y5z1Z/BJxbiNVsVc4q3Z1npfkA94WAeGtvTyeGbFOZDluHZp5LKf6xmhwl8std+ LtKDJgYgPsGu5iqKSzE4fAJXMzShaGAPv4Dj5rD3txsrZYftyqTaz95VEbn26J3vVTKEtS IZhJIt0at7S+dZjcbhbVcQCbaWVNErME76QjWqpgQAnHYd2holfHRBhsrIk5Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723417461; a=rsa-sha256; cv=none; b=yQGRRB+bXgJpoSn8q3wR/W9YNP4UQqCK+hCCPcFTf8FgSPjYzwdzpm4H2h/dwbN3PN+Mip T8udKWDjkySmYDjQA2D4zjy3pKoGmje1HXRKYNoA9ETzcz87QrwkHEixUbbrTSfKes5Fxy f55aqKm0+RLWlhHt2wdIpqpgvSjbCH3nqL4C/t9BTAxbYVuFFRqbJ7rDfgXPjov360TxJs 520ylNZTrLEaVZN9Ih8UEVFoV8cms+z2VguD2aCNgzT2zSd/W1pp+Lxu85JB74bhdlqo8s zAEqdrNDhpcIwgpxeQ1LQUejt/q0nts2cyP9IKLdnIBCy/+xdHMB9YbjnE4OXA== 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=1723417461; 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=fjQDm0jkAHApXFkkuTAb7t31Ztqty8gfvuGS2TJuCHI=; b=EfJDL/VzyCUA8Lv3vFvasy+MoX9/1rx3Fac3tjHQbvwvSz/bR9Ls4NC2HTxBNT63dfnKy8 BKEo8v8r12C5vVqE8Kxley9a31hf7KqYrJUaqlxUANG5PEITLAta8sc+Jonv39cs2r3AaO N6I4LUtIzKUanH67jlH43BTikwjcjDDwAENJQFAjIjhk/e3a9fMUyrOgY2RLxvl4W+cNeM g2AsOD6BLgEvhhIjY6hfQyMTI1XKL8oYg4/51CXw7xp66nH1l2KxyeP8aDiZIOp+kmlYkr e8Kh98vvc0InMQ39B+lnzmj4ChmHrAGjfBzpyuUvrSZ4HNVhbbym6Kh2YOZH3A== 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 4WhtWT4wsjz12lk; Sun, 11 Aug 2024 23:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47BN4LYU032669; Sun, 11 Aug 2024 23:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47BN4LDC032666; Sun, 11 Aug 2024 23:04:21 GMT (envelope-from git) Date: Sun, 11 Aug 2024 23:04:21 GMT Message-Id: <202408112304.47BN4LDC032666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0fb9da95f7cb - stable/13 - pipe: keep uio_iovcnt consistent 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0fb9da95f7cb1730fdf4308f9a12ff8a80c28c87 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0fb9da95f7cb1730fdf4308f9a12ff8a80c28c87 commit 0fb9da95f7cb1730fdf4308f9a12ff8a80c28c87 Author: Ed Maste AuthorDate: 2024-07-17 14:33:53 +0000 Commit: Ed Maste CommitDate: 2024-08-11 23:03:42 +0000 pipe: keep uio_iovcnt consistent In pipe_build_write_buffer we increment uio_iov but did not update uio_iovcnt. This would not cause an OOB read (thanks to to uio_resid) but is inconsistent and could be an issue if other code changes are made in the future. Reported by: Synacktiv Reviewed by: jhb, markj, brooks Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45999 (cherry picked from commit d8ff42e816848a0d4a427755b46b8560cb86ebc8) (cherry picked from commit cbbc8d67301c650dd683566d44ff554993556224) --- sys/kern/sys_pipe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 19f5f07d7523..dd1fd9b6d2a9 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -901,8 +901,10 @@ pipe_build_write_buffer(struct pipe *wpipe, struct uio *uio) uio->uio_iov->iov_len -= size; uio->uio_iov->iov_base = (char *)uio->uio_iov->iov_base + size; - if (uio->uio_iov->iov_len == 0) + if (uio->uio_iov->iov_len == 0) { uio->uio_iov++; + uio->uio_iovcnt--; + } uio->uio_resid -= size; uio->uio_offset += size; return (0);