Module Name: src
Committed By: riastradh
Date: Tue Apr 11 10:22:04 UTC 2023
Modified Files:
src/sys/kern: subr_copy.c
Log Message:
uiomove(9): Stronger assertions about iov array.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/kern/subr_copy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_copy.c
diff -u src/sys/kern/subr_copy.c:1.17 src/sys/kern/subr_copy.c:1.18
--- src/sys/kern/subr_copy.c:1.17 Fri Feb 24 11:02:27 2023
+++ src/sys/kern/subr_copy.c Tue Apr 11 10:22:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_copy.c,v 1.17 2023/02/24 11:02:27 riastradh Exp $ */
+/* $NetBSD: subr_copy.c,v 1.18 2023/04/11 10:22:04 riastradh Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008, 2019
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_copy.c,v 1.17 2023/02/24 11:02:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_copy.c,v 1.18 2023/04/11 10:22:04 riastradh Exp $");
#define __UFETCHSTORE_PRIVATE
#define __UCAS_PRIVATE
@@ -112,10 +112,11 @@ uiomove(void *buf, size_t n, struct uio
KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE);
while (n > 0 && uio->uio_resid) {
+ KASSERT(uio->uio_iovcnt > 0);
iov = uio->uio_iov;
cnt = iov->iov_len;
if (cnt == 0) {
- KASSERT(uio->uio_iovcnt > 0);
+ KASSERT(uio->uio_iovcnt > 1);
uio->uio_iov++;
uio->uio_iovcnt--;
continue;
