Module Name: src
Committed By: matt
Date: Fri Mar 16 06:15:17 UTC 2012
Modified Files:
src/tests/lib/libc/sys: t_msync.c
Log Message:
Don't rely on INT_MAX being unmapped. Use mmap to get a page and then unmap
it. Then use that address for msync.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_msync.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_msync.c
diff -u src/tests/lib/libc/sys/t_msync.c:1.1 src/tests/lib/libc/sys/t_msync.c:1.2
--- src/tests/lib/libc/sys/t_msync.c:1.1 Thu Jul 7 06:57:54 2011
+++ src/tests/lib/libc/sys/t_msync.c Fri Mar 16 06:15:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_msync.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $ */
+/* $NetBSD: t_msync.c,v 1.2 2012/03/16 06:15:17 matt Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_msync.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $");
+__RCSID("$NetBSD: t_msync.c,v 1.2 2012/03/16 06:15:17 matt Exp $");
#include <sys/mman.h>
@@ -165,6 +165,8 @@ ATF_TC_HEAD(msync_err, tc)
ATF_TC_BODY(msync_err, tc)
{
+ char *map = MAP_FAILED;
+
/*
* Test that invalid flags error out.
*/
@@ -173,7 +175,16 @@ ATF_TC_BODY(msync_err, tc)
errno = 0;
- ATF_REQUIRE(msync((void *)INT_MAX, page, MS_SYNC) != 0);
+ /*
+ * Map a page and then unmap to get an unmapped address.
+ */
+ map = mmap(NULL, page, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE,
+ -1, 0);
+ ATF_REQUIRE(map != MAP_FAILED);
+
+ (void)munmap(map, page);
+
+ ATF_REQUIRE(msync(map, page, MS_SYNC) != 0);
ATF_REQUIRE(errno == EFAULT);
}
