From nobody Fri Mar 22 13:33:11 2024 X-Original-To: dev-commits-src-branches@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 4V1NYz35Wbz5DxPj; Fri, 22 Mar 2024 13:33:11 +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 4V1NYz2FWlz45T9; Fri, 22 Mar 2024 13:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114391; 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=xtoXUf5oeHGx3nPBaLKg7fImZze+6YMjJdgZV+UXJsA=; b=E6K6DASlZ3H+WQuk6UM3iJyYtjlxZNTVZyVCsfwT4GscTlXZv0ig9pvxMXRuPvHdiqQMIr cO+GAQOpLaWL66V/HCxLr5PzciTmATYzCKinN1FOF/EmlD1RyeTAZ0tUCoVK3jAhiUzZ2v N9nm+NYtJ+/QzB5OjPL3mRYzGIW4z5e5DQDfL/4cM9iHlgcSR014iApYETFMSDoe7n4bC8 8ufCEJPS9xUIw/xdGOmnnts+PE7BqJtu1lb/urdhmGCZn5oTMphUyWAUwl3OqU+y0rHI0V gH+TBN8LZd0/Wt/cnt0LOEydYZGFzLWXEYzl/hv1mxz94MvgBp/4ONZICBo/Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114391; a=rsa-sha256; cv=none; b=bV536/cZaRLWZwNVo6eAovZp+zzqRbrqF86nRMM8VxJLa7XA0jY2B9hymzUMb9bLetZ48v 1GJ0xCjJsi8GXjcYHDlldJLTPpc772qCh2Fvl5CKKNz7xgBVGEjoE7qaMQ7yDw21fjYRAB Ry7VTnVG5e23sxV8UzZy+TVAVxlOWpvqc0wlCjU6KbLogdDOX5lYmH142aDe2c5LORl3G+ k29Oc9A69CK8sX/ylg+/6zuYuYiKtM8UHI12U92XnykuyklMUjE6VsfvTaLZDvbJizszxg a2m8qXXCur0iSczNgoJYZAo9GsamOEC36aq7mGQLp8pczDUjfu3J6Kay052trQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114391; 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=xtoXUf5oeHGx3nPBaLKg7fImZze+6YMjJdgZV+UXJsA=; b=NX1Vr6SqUsqqu/PGbqxk3TH4DBHWy92WTFj0MMxuPfpKSM42hUtP4BZomfL7CK+7CAlCIa U0WOn+EpZ72R/fsPRDAM6cFg+Uip85wKDHvxfoqqdLp5pNQJ8mHeMQranpsmEE+GWn0LvE 3iAua8fGJEvRadCbSDj9sWky8qg4huMbxh+uh3Jpjk0+HZ6uiBjxsMpb+imVsTjE2zNo3I y6zbj521Fal6+WiYxVR5/nM3RQX3I0uCVX7TbLzqXxljUgINI71u6yHmnj2YqPJ6+LTCw1 EZgpWKSkX66akVQSrj07U0iNoFsQivsT80diuxQFOntotk6FPTuvrnWbI4P1Lw== 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 4V1NYz1sktz1L8f; Fri, 22 Mar 2024 13:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDXBEh002965; Fri, 22 Mar 2024 13:33:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDXBj1002962; Fri, 22 Mar 2024 13:33:11 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:11 GMT Message-Id: <202403221333.42MDXBj1002962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ea3910c452cf - stable/14 - path_test: fix cap_rights_init usage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ea3910c452cf44342e0b65d6283aebeb77a10863 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ea3910c452cf44342e0b65d6283aebeb77a10863 commit ea3910c452cf44342e0b65d6283aebeb77a10863 Author: Ed Maste AuthorDate: 2024-02-15 00:45:42 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 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 (cherry picked from commit 8d1348f55aed6873f34f54bc3b275b73ef0ff66d) --- tests/sys/file/path_test.c | 6 +++--- 1 file 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);