Module Name: src
Committed By: martin
Date: Tue Apr 19 10:21:51 UTC 2011
Modified Files:
src/tests/syscall: t_mmap.c t_msync.c
Log Message:
Add MAP_PRIVATE to mmap() flags where missing.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/syscall/t_mmap.c
cvs rdiff -u -r1.1 -r1.2 src/tests/syscall/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/syscall/t_mmap.c
diff -u src/tests/syscall/t_mmap.c:1.2 src/tests/syscall/t_mmap.c:1.3
--- src/tests/syscall/t_mmap.c:1.2 Mon Apr 4 10:30:29 2011
+++ src/tests/syscall/t_mmap.c Tue Apr 19 10:21:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mmap.c,v 1.2 2011/04/04 10:30:29 jruoho Exp $ */
+/* $NetBSD: t_mmap.c,v 1.3 2011/04/19 10:21:51 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mmap.c,v 1.2 2011/04/04 10:30:29 jruoho Exp $");
+__RCSID("$NetBSD: t_mmap.c,v 1.3 2011/04/19 10:21:51 martin Exp $");
#include <sys/param.h>
#include <sys/mman.h>
@@ -81,19 +81,19 @@
void *map;
errno = 0;
- map = mmap(NULL, 3, PROT_READ, MAP_FILE, -1, 0);
+ map = mmap(NULL, 3, PROT_READ, MAP_FILE|MAP_PRIVATE, -1, 0);
ATF_REQUIRE(map == MAP_FAILED);
ATF_REQUIRE(errno == EBADF);
errno = 0;
- map = mmap(&addr, page, PROT_READ, MAP_FIXED, -1, 0);
+ map = mmap(&addr, page, PROT_READ, MAP_FIXED|MAP_PRIVATE, -1, 0);
ATF_REQUIRE(map == MAP_FAILED);
ATF_REQUIRE(errno == EINVAL);
errno = 0;
- map = mmap(NULL, page, PROT_READ, MAP_ANON, INT_MAX, 0);
+ map = mmap(NULL, page, PROT_READ, MAP_ANON|MAP_PRIVATE, INT_MAX, 0);
ATF_REQUIRE(map == MAP_FAILED);
ATF_REQUIRE(errno == EINVAL);
@@ -121,10 +121,10 @@
ATF_REQUIRE(write(fd, "XXX", 3) == 3);
- map = mmap(NULL, 3, PROT_READ, MAP_FILE, fd, 0);
+ map = mmap(NULL, 3, PROT_READ, MAP_FILE|MAP_PRIVATE, fd, 0);
map_check(map, 1);
- map = mmap(NULL, 3, PROT_WRITE, MAP_FILE, fd, 0);
+ map = mmap(NULL, 3, PROT_WRITE, MAP_FILE|MAP_PRIVATE, fd, 0);
map_check(map, 0);
ATF_REQUIRE(close(fd) == 0);
@@ -152,7 +152,7 @@
* Make a PROT_NONE mapping and try to access it.
* If we catch a SIGSEGV, all works as expected.
*/
- map = mmap(NULL, page, PROT_NONE, MAP_ANON, -1, 0);
+ map = mmap(NULL, page, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0);
ATF_REQUIRE(map != MAP_FAILED);
pid = fork();
@@ -248,7 +248,8 @@
*/
ATF_REQUIRE(ftruncate(fd, page) == 0);
- map = mmap(NULL, page, PROT_READ | PROT_WRITE, MAP_FILE, fd, 0);
+ map = mmap(NULL, page, PROT_READ | PROT_WRITE, MAP_FILE|MAP_PRIVATE,
+ fd, 0);
ATF_REQUIRE(map != MAP_FAILED);
for (i = 0; i < page; i++)
Index: src/tests/syscall/t_msync.c
diff -u src/tests/syscall/t_msync.c:1.1 src/tests/syscall/t_msync.c:1.2
--- src/tests/syscall/t_msync.c:1.1 Thu Apr 7 17:38:02 2011
+++ src/tests/syscall/t_msync.c Tue Apr 19 10:21:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_msync.c,v 1.1 2011/04/07 17:38:02 jruoho Exp $ */
+/* $NetBSD: t_msync.c,v 1.2 2011/04/19 10:21:51 martin 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/04/07 17:38:02 jruoho Exp $");
+__RCSID("$NetBSD: t_msync.c,v 1.2 2011/04/19 10:21:51 martin Exp $");
#include <sys/mman.h>
@@ -89,7 +89,8 @@
tot += rv;
}
- map = mmap(NULL, page, PROT_READ | PROT_WRITE, MAP_FILE, fd, 0);
+ map = mmap(NULL, page, PROT_READ | PROT_WRITE, MAP_FILE|MAP_PRIVATE,
+ fd, 0);
if (map == MAP_FAILED) {
str = "failed to map";
