From nobody Wed Mar 22 13:19:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhTbB6Mm9z40qRq; Wed, 22 Mar 2023 13:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhTbB5sTjz4W4k; Wed, 22 Mar 2023 13:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679491174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LuaJ3zVbmUrnmis40u0CpBnHJxLRqJxncvUuBwDBdT0=; b=lST7eCxQXcWkfz2PZhpHvk6HLj1XB9pw0/VLROrMeQlshNVtMKyIQ7r8Rs5fCF9UR/QyzJ ik61QcUWxfauHa/HDbxmA2wlFgxwuWn9e9q3ww94qckDgpNxIz9OTynH28ET/YJEJGl9Ww +7gcsT8uw+16XZacSvS2YSFClknbuMXoA0bASD8ApgZ9jjdpdfEuVf/GhCgOateVshIqjQ 8bFK1i3Erlgdzxj82wt6AVBIU+I1ZPMqQuyH/ECs16/dKm8/0hWAsRbPeCbDeFcub7n3CX N1gjyUFvcUzhoIt1DykOoWYJNhd2F6aVgMehy9j0u/ngcmZ3gFhpwmZ1d+vuNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679491174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LuaJ3zVbmUrnmis40u0CpBnHJxLRqJxncvUuBwDBdT0=; b=tNyBcogszraxmFuhmsVEg3uCl5mPMzvC0hUnXXCPjXK4mBHjHOrsaPXDOXgx8SfRBU4G17 T1yZVHsyQvngeZ/gAwhdo05F/J+8gH2sjPz7+Ne499OfSaVrW13OjXodMHoPmySruvp2Nb vJdvAXS/GV5ykiKYFX2YBa/GYP0dK5n6nDaNK0RAb6v5Zb0dJePgN3UCJl6onaEgPKhqqK dixfPpjvRCl0mbvLXpe1HJ08oktR0cvrTpmz6h0+wuaRX48HWs4ZWUnFedpNDfbgODgrRv ae6xCnmlFKQpVFqicx1LQ0TzizP9RmwZsgnZ5eSQMoyj0p/VLsKFFdfD7KUygg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679491174; a=rsa-sha256; cv=none; b=gErrJwfCzBuYKiXjmHR3edjVk1Q3m2gF/TgIRREqi/JXbJHNnuRMyPl22OsafOqw6o6hrF MHnNRNSsBHDGeJdxrafTOVd/SMgf52Esbr3oRIayVNYwXAnfPWteH4EKVh/Pl9aVB20H4G uvOFrO0MmKcb8ZbaT67OKtlTmtzmEfkiTKfGCDeDQ31gzD7zC0Z/hfhAviGv7pnrJTOvP5 vFB2UnoBt/5C28dmwZyJQfUWeVjrTkKGBCpHLKMQBSFs+4l5H0UcWKuHKly4td+Wejs3ti zhKI3Cxfsnhj3U3t+Gh0ThDu6IQZtRYCa4QEBe0/y0RMcwUOLDJYwB14krpBIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhTbB4wn2zvbF; Wed, 22 Mar 2023 13:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MDJYqV097013; Wed, 22 Mar 2023 13:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MDJYL3097012; Wed, 22 Mar 2023 13:19:34 GMT (envelope-from git) Date: Wed, 22 Mar 2023 13:19:34 GMT Message-Id: <202303221319.32MDJYL3097012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e5e1d9c7b781 - main - path_test: Add a test case for openat(O_EMPTY_PATH) in capability mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5e1d9c7b781470b2eb31d80f40927481e0053b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e5e1d9c7b781470b2eb31d80f40927481e0053b8 commit e5e1d9c7b781470b2eb31d80f40927481e0053b8 Author: Mark Johnston AuthorDate: 2023-03-22 12:51:58 +0000 Commit: Mark Johnston CommitDate: 2023-03-22 13:19:27 +0000 path_test: Add a test case for openat(O_EMPTY_PATH) in capability mode MFC after: 1 week --- tests/sys/file/path_test.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/tests/sys/file/path_test.c b/tests/sys/file/path_test.c index a212325c7db6..130acababb21 100644 --- a/tests/sys/file/path_test.c +++ b/tests/sys/file/path_test.c @@ -208,6 +208,80 @@ ATF_TC_BODY(path_capsicum, tc) waitchild(child, 4); } +/* + * Check that a pathfd can be converted to a regular fd using openat() in + * capability mode, but that rights on the pathfd are respected. + */ +ATF_TC_WITHOUT_HEAD(path_capsicum_empty); +ATF_TC_BODY(path_capsicum_empty, tc) +{ + char path[PATH_MAX]; + cap_rights_t rights; + int dfd, fd, pathfd, pathdfd; + + mktfile(path, "path_capsicum.XXXXXX"); + + pathdfd = open(".", O_PATH); + ATF_REQUIRE_MSG(pathdfd >= 0, FMT_ERR("open")); + pathfd = open(path, O_PATH); + ATF_REQUIRE_MSG(pathfd >= 0, FMT_ERR("open")); + + ATF_REQUIRE(cap_enter() == 0); + + dfd = openat(pathdfd, "", O_DIRECTORY | O_EMPTY_PATH); + ATF_REQUIRE(dfd >= 0); + CHECKED_CLOSE(dfd); + + /* + * CAP_READ and CAP_LOOKUP should be sufficient to open a directory. + */ + 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); + CHECKED_CLOSE(dfd); + + /* + * ... CAP_READ on its own is not. + */ + cap_rights_init(&rights, CAP_READ); + ATF_REQUIRE(cap_rights_limit(pathdfd, &rights) == 0); + dfd = openat(pathdfd, "", O_DIRECTORY | O_EMPTY_PATH); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, dfd == -1); + + /* + * Now try with a regular file. + */ + fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH); + ATF_REQUIRE(fd >= 0); + CHECKED_CLOSE(fd); + + 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); + CHECKED_CLOSE(fd); + + /* + * CAP_SEEK is needed to open a file for writing without O_APPEND. + */ + 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); + + /* + * CAP_LOOKUP isn't sufficient to open a file for reading. + */ + cap_rights_init(&rights, CAP_LOOKUP); + ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); + fd = openat(pathfd, "", O_RDONLY | O_EMPTY_PATH); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, fd == -1); + + CHECKED_CLOSE(pathfd); + CHECKED_CLOSE(pathdfd); +} + /* Make sure that ptrace(PT_COREDUMP) cannot be used to write to a path fd. */ ATF_TC_WITHOUT_HEAD(path_coredump); ATF_TC_BODY(path_coredump, tc) @@ -937,6 +1011,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, path_access); ATF_TP_ADD_TC(tp, path_aio); ATF_TP_ADD_TC(tp, path_capsicum); + ATF_TP_ADD_TC(tp, path_capsicum_empty); ATF_TP_ADD_TC(tp, path_coredump); ATF_TP_ADD_TC(tp, path_directory); ATF_TP_ADD_TC(tp, path_directory_not_root);