diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2024-02-15 00:45:42 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2024-02-15 13:58:39 +0000 |
| commit | 8d1348f55aed6873f34f54bc3b275b73ef0ff66d (patch) | |
| tree | d46db776d3f964830e17154402d156c953b7382f /tests | |
| parent | 2911c44bafa7daef67f528aa9af251d134f8f8ea (diff) | |
| download | src-8d1348f55aed6873f34f54bc3b275b73ef0ff66d.tar.gz src-8d1348f55aed6873f34f54bc3b275b73ef0ff66d.zip | |
path_test: fix cap_rights_init usage
Capability rights passed to cap_rights_* are not simple bitmaks and
cannot be ORed together in general (although it will work for certain
subsets of rights).
PR: 277057
Fixes: e5e1d9c7b781 ("path_test: Add a test case for...")
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sys/file/path_test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/sys/file/path_test.c b/tests/sys/file/path_test.c index bd98d7a6955a..911c7c7075f0 100644 --- a/tests/sys/file/path_test.c +++ b/tests/sys/file/path_test.c @@ -235,7 +235,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_READ and CAP_LOOKUP should be sufficient to open a directory. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP); ATF_REQUIRE(cap_rights_limit(pathdfd, &rights) == 0); dfd = openat(pathdfd, "", O_DIRECTORY | O_EMPTY_PATH); ATF_REQUIRE(dfd >= 0); @@ -256,7 +256,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) ATF_REQUIRE(fd >= 0); CHECKED_CLOSE(fd); - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH | O_APPEND); ATF_REQUIRE(fd >= 0); @@ -265,7 +265,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_SEEK is needed to open a file for writing without O_APPEND. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH); ATF_REQUIRE_ERRNO(ENOTCAPABLE, fd == -1); |