Date: Wed, 22 Jul 2026 15:12:52 +0000 From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 599a4d6beff0 - main - uvideo: use size_t for sc_mmap_count and loop index in reqbufs Message-ID: <6a60ddf4.321d8.75000217@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=599a4d6beff07f93f019e0aff9105a8e642a600f commit 599a4d6beff07f93f019e0aff9105a8e642a600f Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2026-07-22 11:53:34 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2026-07-22 15:10:58 +0000 uvideo: use size_t for sc_mmap_count and loop index in reqbufs --- sys/dev/usb/video/uvideo.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/dev/usb/video/uvideo.c b/sys/dev/usb/video/uvideo.c index 57d31d2b5286..b31b3fe294cd 100644 --- a/sys/dev/usb/video/uvideo.c +++ b/sys/dev/usb/video/uvideo.c @@ -246,7 +246,7 @@ struct uvideo_softc { vm_offset_t sc_mmap_kva; int sc_mmap_buffer_idx; q_mmap sc_mmap_q; - int sc_mmap_count; + size_t sc_mmap_count; int sc_mmap_flag; vm_object_t sc_mmap_object; @@ -3609,7 +3609,7 @@ uvideo_g_input(struct uvideo_softc *sc, int *input) static int uvideo_reqbufs(struct uvideo_softc *sc, struct v4l2_requestbuffers *rb) { - int i; + size_t i; uint32_t buf_size; size_t buf_size_total; vm_object_t obj; @@ -3637,7 +3637,7 @@ uvideo_reqbufs(struct uvideo_softc *sc, struct v4l2_requestbuffers *rb) return (EINVAL); if (SIZE_MAX / sc->sc_mmap_count < buf_size) return (EINVAL); - buf_size_total = (size_t)sc->sc_mmap_count * buf_size; + buf_size_total = sc->sc_mmap_count * buf_size; buf_size_total = round_page(buf_size_total); /* @@ -3684,11 +3684,10 @@ uvideo_reqbufs(struct uvideo_softc *sc, struct v4l2_requestbuffers *rb) buf_size_total, (uintmax_t)kva); for (i = 0; i < sc->sc_mmap_count; i++) { - sc->sc_mmap[i].buf = sc->sc_mmap_buffer + - ((size_t)i * buf_size); + sc->sc_mmap[i].buf = sc->sc_mmap_buffer + (i * buf_size); sc->sc_mmap[i].v4l2_buf.index = i; - sc->sc_mmap[i].v4l2_buf.m.offset = (size_t)i * buf_size; + sc->sc_mmap[i].v4l2_buf.m.offset = i * buf_size; sc->sc_mmap[i].v4l2_buf.length = buf_size; sc->sc_mmap[i].v4l2_buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; sc->sc_mmap[i].v4l2_buf.sequence = 0;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a60ddf4.321d8.75000217>