system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-03 08:49:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

path_test: fix cap_rights_init usage

Browse Source 
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:		e5e1d9c7b7 ("path_test: Add a test case for...")
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2024-02-14 19:45:42 -05:00
parent 2911c44baf
commit 8d1348f55a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/sys/file/path_test.c
View File

@ -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);