diff options
| author | riastradh <riastradh@NetBSD.org> | 2022-07-06 01:12:45 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2022-07-06 01:12:45 +0000 |
| commit | 813ac3155d71cf3d82bc10137d1d4b87b5447b9d (patch) | |
| tree | dfcbf8ffe701c350f375898d64482d61ecdde442 /sys/dev | |
| parent | 18c4c681d85d51247d1ac4cfeff385115ce136f3 (diff) | |
uvm(9): fo_mmap caller guarantees positive size.
No functional change intended, just sprinkling assertions to make it
clearer.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/audio/audio.c | 8 | ||||
| -rw-r--r-- | sys/dev/nvmm/nvmm.c | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/audio/audio.c b/sys/dev/audio/audio.c index ab7bda60cce..68417536e44 100644 --- a/sys/dev/audio/audio.c +++ b/sys/dev/audio/audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.133 2022/04/23 11:44:01 isaki Exp $ */ +/* $NetBSD: audio.c,v 1.134 2022/07/06 01:12:45 riastradh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -181,7 +181,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.133 2022/04/23 11:44:01 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.134 2022/07/06 01:12:45 riastradh Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -2098,6 +2098,8 @@ audiommap(struct file *fp, off_t *offp, size_t len, int prot, int *flagsp, int bound; int error; + KASSERT(len > 0); + KASSERT(fp->f_audioctx); file = fp->f_audioctx; dev = file->dev; @@ -3562,6 +3564,8 @@ audio_mmap(struct audio_softc *sc, off_t *offp, size_t len, int prot, TRACEF(2, file, "off=%lld, prot=%d", (long long)(*offp), prot); + KASSERT(len > 0); + if (*offp < 0) return EINVAL; diff --git a/sys/dev/nvmm/nvmm.c b/sys/dev/nvmm/nvmm.c index 316366c721d..274c1de798f 100644 --- a/sys/dev/nvmm/nvmm.c +++ b/sys/dev/nvmm/nvmm.c @@ -1,4 +1,4 @@ -/* $NetBSD: nvmm.c,v 1.43 2021/04/12 09:22:58 mrg Exp $ */ +/* $NetBSD: nvmm.c,v 1.44 2022/07/06 01:12:45 riastradh Exp $ */ /* * Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.43 2021/04/12 09:22:58 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.44 2022/07/06 01:12:45 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1099,6 +1099,8 @@ nvmm_mmap(file_t *fp, off_t *offp, size_t size, int prot, int *flagsp, nvmm_cpuid_t cpuid; int error; + KASESRT(size > 0); + if (prot & PROT_EXEC) return EACCES; if (size != PAGE_SIZE) |
