git: d8ff42e81684 - main - pipe: keep uio_iovcnt consistent

[Ed Maste]

The branch main has been updated by emaste:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=d8ff42e816848a0d4a427755b46b8560cb86ebc8

commit d8ff42e816848a0d4a427755b46b8560cb86ebc8
Author:     Ed Maste <ema...@freebsd.org>
AuthorDate: 2024-07-17 14:33:53 +0000
Commit:     Ed Maste <ema...@freebsd.org>
CommitDate: 2024-08-08 18:16:26 +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
---
 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 70b2a03e0140..73b6facec6c7 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -941,8 +941,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);