Page MenuHomeFreeBSD
Files F144317655

D3323.id7730.diff
No OneTemporary
Actions

D3323.id7730.diff
View Options

Index: tests/sys/vm/mmap_test.c
===================================================================
--- tests/sys/vm/mmap_test.c
+++ tests/sys/vm/mmap_test.c
@@ -110,23 +110,28 @@
ATF_TC_WITHOUT_HEAD(mmap__bad_arguments);
ATF_TC_BODY(mmap__bad_arguments, tc)
{
- int fd;
+ int shmfd, zerofd;
- ATF_REQUIRE((fd = shm_open(SHM_ANON, O_RDWR, 0644)) >= 0);
- ATF_REQUIRE(ftruncate(fd, getpagesize()) == 0);
+ ATF_REQUIRE((shmfd = shm_open(SHM_ANON, O_RDWR, 0644)) >= 0);
+ ATF_REQUIRE(ftruncate(shmfd, getpagesize()) == 0);
+ ATF_REQUIRE((zerofd = open("/dev/zero", O_RDONLY)) >= 0);
/* These should work. */
checked_mmap(PROT_READ | PROT_WRITE, MAP_ANON, -1, 0,
"simple MAP_ANON");
- checked_mmap(PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0,
+ checked_mmap(PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, 0,
"simple shm fd shared");
- checked_mmap(PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0,
+ checked_mmap(PROT_READ | PROT_WRITE, MAP_PRIVATE, shmfd, 0,
"simple shm fd private");
+ checked_mmap(PROT_READ, MAP_SHARED, zerofd, 0,
+ "simple /dev/zero shared");
+ checked_mmap(PROT_READ | PROT_WRITE, MAP_PRIVATE, zerofd, 0,
+ "simple /dev/zero private");
/* Extra PROT flags. */
checked_mmap(PROT_READ | PROT_WRITE | 0x100000, MAP_ANON, -1, EINVAL,
"MAP_ANON with extra PROT flags");
- checked_mmap(0xffff, MAP_SHARED, fd, EINVAL,
+ checked_mmap(0xffff, MAP_SHARED, shmfd, EINVAL,
"shm fd with garbage PROT");
/* Undefined flag. */
@@ -136,11 +141,11 @@
/* Both MAP_SHARED and MAP_PRIVATE */
checked_mmap(PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE |
MAP_SHARED, -1, EINVAL, "MAP_ANON with both SHARED and PRIVATE");
- checked_mmap(PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_SHARED, fd,
+ checked_mmap(PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_SHARED, shmfd,
EINVAL, "shm fd with both SHARED and PRIVATE");
/* At least one of MAP_SHARED or MAP_PRIVATE without ANON */
- checked_mmap(PROT_READ | PROT_WRITE, 0, fd, EINVAL,
+ checked_mmap(PROT_READ | PROT_WRITE, 0, shmfd, EINVAL,
"shm fd without sharing flag");
/* MAP_ANON with either sharing flag (impacts fork). */
@@ -152,6 +157,64 @@
/* MAP_ANON should require an fd of -1. */
checked_mmap(PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, 0, EINVAL,
"MAP_ANON with fd != -1");
+
+ /* Writable MAP_SHARED should fail on read-only descriptors. */
+ checked_mmap(PROT_READ | PROT_WRITE, MAP_SHARED, zerofd, EACCES,
+ "MAP_SHARED of read-only /dev/zero");
+}
+
+ATF_TC_WITHOUT_HEAD(mmap__cdev_private);
+ATF_TC_BODY(mmap__cdev_private, tc)
+{
+ int fd;
+
+ fd = open("/dev/mem", O_RDONLY);
+ if (fd == -1)
+ atf_tc_skip("Could not open /dev/mem");
+
+ /*
+ * Character devices other than /dev/zero do not support private
+ * mappings.
+ */
+ checked_mmap(PROT_READ, MAP_PRIVATE, fd, EINVAL,
+ "MAP_PRIVATE of /dev/mem");
+}
+
+ATF_TC_WITHOUT_HEAD(mmap__dev_zero);
+ATF_TC_BODY(mmap__dev_zero, tc)
+{
+ char *p1, *p2, *p3;
+ size_t i;
+ int fd;
+
+ ATF_REQUIRE((fd = open("/dev/zero", O_RDONLY)) >= 0);
+
+ p1 = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,
+ 0);
+ ATF_REQUIRE(p1 != MAP_FAILED);
+
+ p2 = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,
+ 0);
+ ATF_REQUIRE(p2 != MAP_FAILED);
+
+ for (i = 0; i < getpagesize(); i++)
+ ATF_REQUIRE_EQ_MSG(0, p1[i], "byte at p1[%zu] is %x", i, p1[i]);
+
+ ATF_REQUIRE(memcmp(p1, p2, getpagesize()) == 0);
+
+ p1[0] = 1;
+
+ ATF_REQUIRE(p2[0] == 0);
+
+ p2[0] = 2;
+
+ ATF_REQUIRE(p1[0] == 1);
+
+ p3 = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,
+ 0);
+ ATF_REQUIRE(p3 != MAP_FAILED);
+
+ ATF_REQUIRE(p3[0] == 0);
}
ATF_TP_ADD_TCS(tp)
@@ -159,6 +222,8 @@
ATF_TP_ADD_TC(tp, mmap__map_at_zero);
ATF_TP_ADD_TC(tp, mmap__bad_arguments);
+ ATF_TP_ADD_TC(tp, mmap__cdev_private);
+ ATF_TP_ADD_TC(tp, mmap__dev_zero);
return (atf_no_error());
}

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 8, 7:49 PM (8 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28491341
Default Alt Text
D3323.id7730.diff (3 KB)

Event Timeline