d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/sys/vfs/lookup_cap_dotdot: No longer aborts after ATF update

Browse Source 
It appears this test no longer fails after c203bd70b5957f85616424b6fa374479372d06e3.

PR:		215690
This commit is contained in:
Alex Richardson 2021-02-04 17:48:29 +00:00
parent 72692dfdfe
commit 1eec5861d5
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/sys/vfs/lookup_cap_dotdot.c
View File

@ -80,6 +80,7 @@ check_capsicum(void)
{ {
ATF_REQUIRE_FEATURE("security_capabilities"); ATF_REQUIRE_FEATURE("security_capabilities");
ATF_REQUIRE_FEATURE("security_capability_mode"); ATF_REQUIRE_FEATURE("security_capability_mode");
ATF_REQUIRE_SYSCTL_INT("kern.trap_enotcap", 0);
} }
/* /*
@ -124,8 +125,6 @@ ATF_TC_BODY(lookup_cap_dotdot__basic, tc)
cap_rights_init(&rights, CAP_LOOKUP, CAP_READ); cap_rights_init(&rights, CAP_LOOKUP, CAP_READ);
ATF_REQUIRE(cap_rights_limit(dirfd, &rights) >= 0); ATF_REQUIRE(cap_rights_limit(dirfd, &rights) >= 0);
atf_tc_expect_signal(SIGABRT, "needs change done upstream in atf/kyua according to cem: bug 215690");
ATF_REQUIRE(cap_enter() >= 0); ATF_REQUIRE(cap_enter() >= 0);
ATF_REQUIRE_MSG(openat(dirfd, "d1/..", O_RDONLY) >= 0, "%s", ATF_REQUIRE_MSG(openat(dirfd, "d1/..", O_RDONLY) >= 0, "%s",
@ -146,8 +145,6 @@ ATF_TC_BODY(lookup_cap_dotdot__advanced, tc)
check_capsicum(); check_capsicum();
prepare_dotdot_tests(); prepare_dotdot_tests();
atf_tc_expect_signal(SIGABRT, "needs change done upstream in atf/kyua according to cem: bug 215690");
cap_rights_init(&rights, CAP_LOOKUP, CAP_READ); cap_rights_init(&rights, CAP_LOOKUP, CAP_READ);
ATF_REQUIRE(cap_rights_limit(dirfd, &rights) >= 0); ATF_REQUIRE(cap_rights_limit(dirfd, &rights) >= 0);
@ -191,8 +188,6 @@ ATF_TC_BODY(capmode__negative, tc)
check_capsicum(); check_capsicum();
prepare_dotdot_tests(); prepare_dotdot_tests();
atf_tc_expect_signal(SIGABRT, "needs change done upstream in atf/kyua according to cem: bug 215690");
ATF_REQUIRE(cap_enter() == 0); ATF_REQUIRE(cap_enter() == 0);
/* open() not permitted in capability mode */ /* open() not permitted in capability mode */
@ -231,8 +226,6 @@ ATF_TC_BODY(lookup_cap_dotdot__negative, tc)
cap_rights_init(&rights, CAP_LOOKUP, CAP_READ); cap_rights_init(&rights, CAP_LOOKUP, CAP_READ);
ATF_REQUIRE(cap_rights_limit(dirfd, &rights) >= 0); ATF_REQUIRE(cap_rights_limit(dirfd, &rights) >= 0);
atf_tc_expect_signal(SIGABRT, "needs change done upstream in atf/kyua according to cem: bug 215690");
ATF_REQUIRE(cap_enter() >= 0); ATF_REQUIRE(cap_enter() >= 0);
ATF_REQUIRE_ERRNO(ENOTCAPABLE, openat(dirfd, "..", O_RDONLY) < 0); ATF_REQUIRE_ERRNO(ENOTCAPABLE, openat(dirfd, "..", O_RDONLY) < 0);