Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cheribsdtest: shm hoarding tests #2210

Merged
merged 3 commits into from
Sep 3, 2024
Merged

cheribsdtest: shm hoarding tests #2210

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af89dfd
cheribsdtest: style in vm_shm_open_anon_unix_surprise
brooksdavis Aug 8, 2024
071b76c
cheribsdtest: hoarding by unmapped shm object
brooksdavis Aug 28, 2024
a9235c1
cheribsdtest: hoarding by closed shm object
brooksdavis Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 172 additions & 12 deletions bin/cheribsdtest/cheribsdtest_vm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,17 @@
cheribsdtest_failure_errx("Fork failed; errno=%d", errno);

if (pid == 0) {
void * __capability * map;
void * __capability *map;

Check failure on line 180 in bin/cheribsdtest/cheribsdtest_vm.c

View workflow job for this annotation

GitHub Actions / Style Checker 

"foo * bar" should be "foo *bar"

Check failure on line 180 in bin/cheribsdtest/cheribsdtest_vm.c

View workflow job for this annotation

GitHub Actions / Style Checker 

spaces required around that '*' (ctx:WxV)
void * __capability c;
int fd, tag;
struct msghdr msg = { 0 };
struct cmsghdr * cmsg;
char cmsgbuf[CMSG_SPACE(sizeof(fd))] = { 0 } ;
char iovbuf[16];
struct iovec iov = { .iov_base = iovbuf, .iov_len = sizeof(iovbuf) };
struct iovec iov = {
.iov_base = iovbuf,
.iov_len = sizeof(iovbuf)
};

close(sv[1]);

Expand All @@ -196,15 +199,13 @@
CHERIBSDTEST_CHECK_SYSCALL(recvmsg(sv[0], &msg, 0));

/* Deconstruct cmsg */
/* XXX Doesn't compile: cmsg = CMSG_FIRSTHDR(&msg); */
cmsg = msg.msg_control;
memmove(&fd, CMSG_DATA(cmsg), sizeof(fd));
cmsg = CMSG_FIRSTHDR(&msg);
memcpy(&fd, CMSG_DATA(cmsg), sizeof(fd));

CHERIBSDTEST_VERIFY2(fd >= 0, "fd read OK");

map = CHERIBSDTEST_CHECK_SYSCALL(mmap(NULL, getpagesize(),
PROT_READ, MAP_SHARED, fd,
0));
PROT_READ, MAP_SHARED, fd, 0));
c = *map;

if (verbose)
Expand All @@ -219,14 +220,17 @@

exit(tag);
} else {
void * __capability * map;
void * __capability *map;

Check failure on line 223 in bin/cheribsdtest/cheribsdtest_vm.c

View workflow job for this annotation

GitHub Actions / Style Checker 

"foo * bar" should be "foo *bar"

Check failure on line 223 in bin/cheribsdtest/cheribsdtest_vm.c

View workflow job for this annotation

GitHub Actions / Style Checker 

spaces required around that '*' (ctx:WxV)
void * __capability c;
int fd, res;
struct msghdr msg = { 0 };
struct cmsghdr * cmsg;
char cmsgbuf[CMSG_SPACE(sizeof(fd))] = { 0 };
char iovbuf[16] = { 0 };
struct iovec iov = { .iov_base = iovbuf, .iov_len = sizeof(iovbuf) };
struct iovec iov = {
.iov_base = iovbuf,
.iov_len = sizeof(iovbuf)
};

close(sv[0]);

Expand All @@ -252,12 +256,11 @@
msg.msg_iovlen = 1;
msg.msg_control = cmsgbuf;
msg.msg_controllen = sizeof(cmsgbuf);
/* XXX cmsg = CMSG_FIRSTHDR(&msg); */
cmsg = msg.msg_control;
cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
cmsg->cmsg_len = CMSG_LEN(sizeof fd);
memmove(CMSG_DATA(cmsg), &fd, sizeof(fd));
memcpy(CMSG_DATA(cmsg), &fd, sizeof(fd));
msg.msg_controllen = cmsg->cmsg_len;

/* Send! */
Expand Down Expand Up @@ -2620,6 +2623,163 @@

cheribsdtest_success();
}

CHERIBSDTEST(cheri_revoke_shm_anon_hoard_unmapped,
"Capability is revoked within an unmapped shm object",
.ct_xfail_reason = "unmapped part of shm objects aren't revoked")
{
int fd;
void * volatile to_revoke;
void * volatile *map;

fd = CHERIBSDTEST_CHECK_SYSCALL(shm_open(SHM_ANON, O_RDWR, 0600));
CHERIBSDTEST_CHECK_SYSCALL(ftruncate(fd, getpagesize()));

map = CHERIBSDTEST_CHECK_SYSCALL(mmap(NULL, getpagesize(),
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0));

to_revoke = malloc(1);
*map = to_revoke;
CHERIBSDTEST_VERIFY(cheri_gettag(*map));

munmap(__DEVOLATILE(void *, map), getpagesize());

free(to_revoke);
malloc_revoke();
CHERIBSDTEST_VERIFY(check_revoked(to_revoke));

map = CHERIBSDTEST_CHECK_SYSCALL(mmap(NULL, getpagesize(),
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0));

CHERIBSDTEST_VERIFY(to_revoke == *map);
CHERIBSDTEST_VERIFY(check_revoked(*map));

cheribsdtest_success();
}

CHERIBSDTEST(cheri_revoke_shm_anon_hoard_closed,
brooksdavis marked this conversation as resolved.
Show resolved Hide resolved
"Capability is revoked within an unmapped and closed shm object",
.ct_xfail_reason = "unmapped part of shm objects aren't revoked")
{
int sv[2];
int pid;

CHERIBSDTEST_CHECK_SYSCALL(socketpair(AF_UNIX, SOCK_DGRAM, 0, sv) != 0);

pid = fork();
if (pid == -1)
cheribsdtest_failure_errx("Fork failed; errno=%d", errno);

if (pid == 0) {
int fd;
struct msghdr msg = { 0 };
struct cmsghdr * cmsg;

Check failure on line 2676 in bin/cheribsdtest/cheribsdtest_vm.c

View workflow job for this annotation

GitHub Actions / Style Checker 

"foo * bar" should be "foo *bar"
char cmsgbuf[CMSG_SPACE(sizeof(fd))] = { 0 } ;
char iovbuf[16];
struct iovec iov = {
.iov_base = iovbuf,
.iov_len = sizeof(iovbuf)
};

close(sv[1]);

/* Read from socket */
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_control = cmsgbuf;
msg.msg_controllen = sizeof(cmsgbuf);
CHERIBSDTEST_CHECK_SYSCALL(recvmsg(sv[0], &msg, 0));

/* Deconstruct cmsg */
cmsg = CMSG_FIRSTHDR(&msg);
memcpy(&fd, CMSG_DATA(cmsg), sizeof(fd));

CHERIBSDTEST_VERIFY2(fd >= 0, "fd read OK");

/* Send the fd back. */
CHERIBSDTEST_CHECK_SYSCALL(sendmsg(sv[0], &msg, 0));

close(sv[0]);
close(fd);

exit(0);
} else {
void * volatile to_revoke;
void * volatile * map;

Check failure on line 2708 in bin/cheribsdtest/cheribsdtest_vm.c

View workflow job for this annotation

GitHub Actions / Style Checker 

"foo * volatile * bar" should be "foo * volatile *bar"

Check failure on line 2708 in bin/cheribsdtest/cheribsdtest_vm.c

View workflow job for this annotation

GitHub Actions / Style Checker 

space prohibited after that '*' (ctx:WxW)
int fd, res;
struct msghdr msg = { 0 };
struct cmsghdr * cmsg;

Check failure on line 2711 in bin/cheribsdtest/cheribsdtest_vm.c

View workflow job for this annotation

GitHub Actions / Style Checker 

"foo * bar" should be "foo *bar"
char cmsgbuf[CMSG_SPACE(sizeof(fd))] = { 0 };
char iovbuf[16] = { 0 };
struct iovec iov = {
.iov_base = iovbuf,
.iov_len = sizeof(iovbuf)
};

close(sv[0]);

fd = CHERIBSDTEST_CHECK_SYSCALL(shm_open(SHM_ANON, O_RDWR, 0600));

Check warning on line 2721 in bin/cheribsdtest/cheribsdtest_vm.c

View workflow job for this annotation

GitHub Actions / Style Checker 

line over 80 characters
CHERIBSDTEST_CHECK_SYSCALL(ftruncate(fd, getpagesize()));

map = CHERIBSDTEST_CHECK_SYSCALL(mmap(NULL, getpagesize(),
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0));

to_revoke = malloc(1);
*map = to_revoke;
CHERIBSDTEST_VERIFY(cheri_gettag(*map));

CHERIBSDTEST_CHECK_SYSCALL(munmap(__DEVOLATILE(void *, map),
getpagesize()));

/* Construct control message */
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_control = cmsgbuf;
msg.msg_controllen = sizeof(cmsgbuf);
cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
cmsg->cmsg_len = CMSG_LEN(sizeof fd);
memcpy(CMSG_DATA(cmsg), &fd, sizeof(fd));
msg.msg_controllen = cmsg->cmsg_len;

/* Send! */
CHERIBSDTEST_CHECK_SYSCALL(sendmsg(sv[1], &msg, 0));
close(fd);

/* Revoke the pointer */
free(to_revoke);
malloc_revoke();
CHERIBSDTEST_VERIFY(check_revoked(to_revoke));

/* Receive the fd back */
msg.msg_controllen = sizeof(cmsgbuf);
CHERIBSDTEST_CHECK_SYSCALL(recvmsg(sv[1], &msg, 0));

/* Deconstruct cmsg */
cmsg = CMSG_FIRSTHDR(&msg);
memcpy(&fd, CMSG_DATA(cmsg), sizeof(fd));

CHERIBSDTEST_VERIFY2(fd >= 0, "fd read OK");

map = CHERIBSDTEST_CHECK_SYSCALL(mmap(NULL, getpagesize(),
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0));

CHERIBSDTEST_VERIFY(to_revoke == *map);
CHERIBSDTEST_VERIFY(check_revoked(*map));

close(sv[1]);
close(fd);

waitpid(pid, &res, 0);
if (res == 0) {
cheribsdtest_success();
} else {
cheribsdtest_failure_errx("child failed");
}
}
}

#endif /* CHERIBSDTEST_CHERI_REVOKE_TESTS */

#endif /* __CHERI_PURE_CAPABILITY__ */

Check warning on line 2785 in bin/cheribsdtest/cheribsdtest_vm.c

View workflow job for this annotation

GitHub Actions / Style Checker 

Missing Signed-off-by: line
Loading