Index: head/contrib/netbsd-tests/lib/libc/c063/t_o_search.c =================================================================== --- head/contrib/netbsd-tests/lib/libc/c063/t_o_search.c (revision 357687) +++ head/contrib/netbsd-tests/lib/libc/c063/t_o_search.c (revision 357688) @@ -1,374 +1,365 @@ -/* $NetBSD: t_o_search.c,v 1.9 2020/02/06 12:18:06 martin Exp $ */ +/* $NetBSD: t_o_search.c,v 1.10 2020/02/08 19:58:36 kamil Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation * by Emmanuel Dreyfus. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include -__RCSID("$NetBSD: t_o_search.c,v 1.9 2020/02/06 12:18:06 martin Exp $"); +__RCSID("$NetBSD: t_o_search.c,v 1.10 2020/02/08 19:58:36 kamil Exp $"); #include #include -#ifdef __FreeBSD__ #include -#else #include -#endif #include #include #include #include #include #include #include #include #include #include /* * dholland 20130112: disable tests that require O_SEARCH semantics * until a decision is reached about the semantics of O_SEARCH and a * non-broken implementation is available. */ #if defined(__FreeBSD__) || (O_MASK & O_SEARCH) != 0 #define USE_O_SEARCH #endif +#ifdef __FreeBSD__ +#define statvfs statfs +#define fstatvfs fstatfs +#endif + #define DIR "dir" #define FILE "dir/o_search" #define BASEFILE "o_search" ATF_TC(o_search_perm1); ATF_TC_HEAD(o_search_perm1, tc) { atf_tc_set_md_var(tc, "descr", "See that openat enforces search permission"); atf_tc_set_md_var(tc, "require.user", "unprivileged"); } ATF_TC_BODY(o_search_perm1, tc) { int dfd; int fd; ATF_REQUIRE(mkdir(DIR, 0755) == 0); ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1); ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE(fchmod(dfd, 0644) == 0); ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) == -1); ATF_REQUIRE(errno == EACCES); ATF_REQUIRE(close(dfd) == 0); } #ifdef USE_O_SEARCH ATF_TC(o_search_root_flag1); ATF_TC_HEAD(o_search_root_flag1, tc) { atf_tc_set_md_var(tc, "descr", "See that root openat honours O_SEARCH"); atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(o_search_root_flag1, tc) { int dfd; int fd; ATF_REQUIRE(mkdir(DIR, 0755) == 0); ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE((dfd = open(DIR, O_RDONLY|O_SEARCH, 0)) != -1); ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE(fchmod(dfd, 0644) == 0); ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE(fchmod(dfd, 0444) == 0); ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1); ATF_REQUIRE(close(dfd) == 0); } ATF_TC(o_search_unpriv_flag1); ATF_TC_HEAD(o_search_unpriv_flag1, tc) { atf_tc_set_md_var(tc, "descr", "See that openat honours O_SEARCH"); atf_tc_set_md_var(tc, "require.user", "unprivileged"); } ATF_TC_BODY(o_search_unpriv_flag1, tc) { int dfd; int fd; ATF_REQUIRE(mkdir(DIR, 0755) == 0); ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE((dfd = open(DIR, O_RDONLY|O_SEARCH, 0)) != -1); ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE(fchmod(dfd, 0644) == 0); ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE(fchmod(dfd, 0444) == 0); ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1); ATF_REQUIRE(close(dfd) == 0); } #endif /* USE_O_SEARCH */ ATF_TC(o_search_perm2); ATF_TC_HEAD(o_search_perm2, tc) { atf_tc_set_md_var(tc, "descr", "See that faccessat enforces search permission"); atf_tc_set_md_var(tc, "require.user", "unprivileged"); } ATF_TC_BODY(o_search_perm2, tc) { int dfd; int fd; ATF_REQUIRE(mkdir(DIR, 0755) == 0); ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1); ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0); ATF_REQUIRE(fchmod(dfd, 0644) == 0); ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == -1); ATF_REQUIRE(errno == EACCES); ATF_REQUIRE(close(dfd) == 0); } #ifdef USE_O_SEARCH ATF_TC(o_search_root_flag2); ATF_TC_HEAD(o_search_root_flag2, tc) { atf_tc_set_md_var(tc, "descr", "See that root fstatat honours O_SEARCH"); atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(o_search_root_flag2, tc) { int dfd; int fd; ATF_REQUIRE(mkdir(DIR, 0755) == 0); ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE((dfd = open(DIR, O_RDONLY|O_SEARCH, 0)) != -1); ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0); ATF_REQUIRE(fchmod(dfd, 0644) == 0); ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0); ATF_REQUIRE(fchmod(dfd, 0444) == 0); ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0); ATF_REQUIRE(close(dfd) == 0); } ATF_TC(o_search_unpriv_flag2); ATF_TC_HEAD(o_search_unpriv_flag2, tc) { atf_tc_set_md_var(tc, "descr", "See that fstatat honours O_SEARCH"); atf_tc_set_md_var(tc, "require.user", "unprivileged"); } ATF_TC_BODY(o_search_unpriv_flag2, tc) { int dfd; int fd; ATF_REQUIRE(mkdir(DIR, 0755) == 0); ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE((dfd = open(DIR, O_RDONLY|O_SEARCH, 0)) != -1); ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0); ATF_REQUIRE(fchmod(dfd, 0644) == 0); ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0); ATF_REQUIRE(fchmod(dfd, 0444) == 0); ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0); ATF_REQUIRE(close(dfd) == 0); } #endif /* USE_O_SEARCH */ ATF_TC(o_search_notdir); ATF_TC_HEAD(o_search_notdir, tc) { atf_tc_set_md_var(tc, "descr", "See that openat fails with non dir fd"); } ATF_TC_BODY(o_search_notdir, tc) { int dfd; int fd; ATF_REQUIRE(mkdir(DIR, 0755) == 0); ATF_REQUIRE((dfd = open(FILE, O_CREAT|O_SEARCH, 0644)) != -1); ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) == -1); ATF_REQUIRE(errno == ENOTDIR); ATF_REQUIRE(close(dfd) == 0); } #ifdef USE_O_SEARCH ATF_TC(o_search_nord); ATF_TC_HEAD(o_search_nord, tc) { atf_tc_set_md_var(tc, "descr", "See that openat succeeds with no read permission"); atf_tc_set_md_var(tc, "require.user", "unprivileged"); } ATF_TC_BODY(o_search_nord, tc) { int dfd, fd; ATF_REQUIRE(mkdir(DIR, 0755) == 0); ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE(chmod(DIR, 0100) == 0); ATF_REQUIRE((dfd = open(DIR, O_SEARCH, 0)) != -1); ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) != -1); ATF_REQUIRE(close(dfd) == 0); } ATF_TC(o_search_getdents); ATF_TC_HEAD(o_search_getdents, tc) { atf_tc_set_md_var(tc, "descr", "See that O_SEARCH forbids getdents"); } ATF_TC_BODY(o_search_getdents, tc) { char buf[1024]; int dfd; ATF_REQUIRE(mkdir(DIR, 0755) == 0); ATF_REQUIRE((dfd = open(DIR, O_SEARCH, 0)) != -1); ATF_REQUIRE(getdents(dfd, buf, sizeof(buf)) < 0); ATF_REQUIRE(close(dfd) == 0); } ATF_TC(o_search_revokex); ATF_TC_HEAD(o_search_revokex, tc) { atf_tc_set_md_var(tc, "descr", "See that *at behaves after chmod -x"); atf_tc_set_md_var(tc, "require.user", "unprivileged"); } ATF_TC_BODY(o_search_revokex, tc) { - int dfd, fd; + struct statvfs vst; struct stat sb; + int dfd, fd; ATF_REQUIRE(mkdir(DIR, 0755) == 0); ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE((dfd = open(DIR, O_SEARCH, 0)) != -1); /* Drop permissions. The kernel must still not check the exec bit. */ ATF_REQUIRE(chmod(DIR, 0000) == 0); - { - const char *fstypename; -#ifdef __FreeBSD__ - struct statfs st; - fstatfs(dfd, &st); - fstypename = st.f_fstypename; -#else - struct statvfs vst; + fstatvfs(dfd, &vst); + if (strcmp(vst.f_fstypename, "nfs") == 0) + atf_tc_expect_fail("NFS protocol cannot observe O_SEARCH semantics"); - fstatvfs(dfd, &vst); - fstypename = vst.f_fstypename; -#endif - if (strcmp(fstypename, "nfs") == 0) - atf_tc_expect_fail( - "NFS protocol cannot observe O_SEARCH semantics"); - } ATF_REQUIRE(fstatat(dfd, BASEFILE, &sb, 0) == 0); ATF_REQUIRE(close(dfd) == 0); } #endif /* USE_O_SEARCH */ ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, o_search_perm1); #ifdef USE_O_SEARCH ATF_TP_ADD_TC(tp, o_search_root_flag1); ATF_TP_ADD_TC(tp, o_search_unpriv_flag1); #endif ATF_TP_ADD_TC(tp, o_search_perm2); #ifdef USE_O_SEARCH ATF_TP_ADD_TC(tp, o_search_root_flag2); ATF_TP_ADD_TC(tp, o_search_unpriv_flag2); #endif ATF_TP_ADD_TC(tp, o_search_notdir); #ifdef USE_O_SEARCH ATF_TP_ADD_TC(tp, o_search_nord); ATF_TP_ADD_TC(tp, o_search_getdents); ATF_TP_ADD_TC(tp, o_search_revokex); #endif return atf_no_error(); } Index: head/contrib/netbsd-tests =================================================================== --- head/contrib/netbsd-tests (revision 357687) +++ head/contrib/netbsd-tests (revision 357688) Property changes on: head/contrib/netbsd-tests ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /vendor:r357687