Date: Thu, 26 Mar 2026 14:47:24 +0000 From: Alan Somers <asomers@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 1ce3d3f610e2 - stable/15 - aio(4) tests: do not rely on (int *)-1 being invalid address Message-ID: <69c546fc.1e4cc.18049ad5@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1ce3d3f610e26c2a90c195551725b2f669b0f871 commit 1ce3d3f610e26c2a90c195551725b2f669b0f871 Author: Alan Somers <asomers@FreeBSD.org> AuthorDate: 2026-02-17 00:27:02 +0000 Commit: Alan Somers <asomers@FreeBSD.org> CommitDate: 2026-03-26 14:45:17 +0000 aio(4) tests: do not rely on (int *)-1 being invalid address Explicitly mmap guard and use it as the invalid address instead. (cherry picked from commit dc9a8d300ba5c4c319589d78231e9d0e76576cbf) --- tests/sys/aio/aio_test.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/sys/aio/aio_test.c b/tests/sys/aio/aio_test.c index 64939825ec66..1a4baf70b1e3 100644 --- a/tests/sys/aio/aio_test.c +++ b/tests/sys/aio/aio_test.c @@ -39,6 +39,7 @@ #include <sys/param.h> #include <sys/event.h> +#include <sys/mman.h> #include <sys/mdioctl.h> #include <sys/module.h> #include <sys/resource.h> @@ -1689,6 +1690,7 @@ ATF_TC_BODY(aio_writev_efault, tc) struct aiocb aio; ssize_t buflen; char *buffer; + void *unmapped; struct iovec iov[2]; long seed; int fd; @@ -1698,13 +1700,16 @@ ATF_TC_BODY(aio_writev_efault, tc) fd = aio_md_setup(); + unmapped = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_GUARD, -1, 0); + ATF_REQUIRE(unmapped != MAP_FAILED); + seed = random(); buflen = 4096; buffer = malloc(buflen); aio_fill_buffer(buffer, buflen, seed); iov[0].iov_base = buffer; iov[0].iov_len = buflen; - iov[1].iov_base = (void*)-1; /* Invalid! */ + iov[1].iov_base = (void*)unmapped; /* Invalid! */ iov[1].iov_len = buflen; bzero(&aio, sizeof(aio)); aio.aio_fildes = fd;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c546fc.1e4cc.18049ad5>