Date: Tue, 13 Aug 2024 16:44:41 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8807350405ce - releng/13.4 - pipe: keep uio_iovcnt consistent Message-ID: <202408131644.47DGif72067521@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/13.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8807350405ce08278dbd8d2d370f9f09d7c2ad47 commit 8807350405ce08278dbd8d2d370f9f09d7c2ad47 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2024-07-17 14:33:53 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2024-08-13 16:39:56 +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) (cherry picked from commit 0fb9da95f7cb1730fdf4308f9a12ff8a80c28c87) Approved by: re (cperciva) --- 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408131644.47DGif72067521>