From nobody Fri Mar 22 13:33:10 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 4V1NYy2NVJz5DxN4; Fri, 22 Mar 2024 13:33:10 +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 4V1NYy1STsz45dH; Fri, 22 Mar 2024 13:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114390; 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=pqAR5CDPabWmDqXX8gxIj+N+i8Yc1nBa0Ef1X0YFZec=; b=biFbzvEZsjrofy1d9UFG5kOVR/QF9/SAOrFw38vJZkXsyjW2rC0lVAdRTnDk0urjMm2osq 0kOzanXZdRCPgaWtFGgXnvg3gzWexLI7Qw4Uyj1CrcD7Tz0/M8TARDdGZRJEECBx1hCADy 2Uam2c/fGq7OtN/K21UL+uvDpYq7UWXDOos9fUc0hQnccWgYR9AimKF4QN4sXWqpWJMRKA pE59JGu+Rz9S843qT7+1gBtlTseRIaYyd3S0SZqh4W80Up+gos7vWAI7nEytVUxfdD/IK+ fXS1tXugdBFzoPlzUi/zpuxLTjAQ7fRCvc1wef4nxGbbGzOaPKqmHMrIViufRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114390; a=rsa-sha256; cv=none; b=i48b2AvAdkKLd2yzm7nr6dhailDHxDVG+r6Z+Zks27fcS0rLZlGzwcdp0HYv4d6lzjMk0e eKkfWbJclUTqfuQXMKB+auFXIVHs3X1LlAjZVmYkUy4TmSIuhzT3Qnlt0viEb0NoYC/FVh 0XZTQVixC+L3Ov8aRo/McEVmE73yitSkQ0valcnqsLgN9t1nkX6MlbLGQkpO5JCEUix2DI ebRoHRfQk1N1L6ljXTXQedleMfenaTpHSxDIEcY5eDxjfJdCu0ivD6x+VvTBcdTLXJwgLD q44dihsKiPvfVpirfSOwuUhQd/7/7TtzHxgDeSRPpHikRkzLnLNL/wYhh9asxQ== 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=1711114390; 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=pqAR5CDPabWmDqXX8gxIj+N+i8Yc1nBa0Ef1X0YFZec=; b=AQqBy08tEwhTBrmQOcB6yhtBYfRoC8RyO5wMYJNsC0vbyW9K/wV0WaZvUU2H/bv+AMs8q2 ZKLITPM1wsDToIXey12bx7YN/9/UGnQNUzOuIGlHw9zlve7dHlm3Z7Ga5eRZPNZJkPGN3f xD+BWbFERIYgmh96t3LF3k4ZWpUg4gQ44UJpdQ1MpM0JFf5FCZyL83bJBPDPn3Qi6QiXm7 815ZBvkjQ9ZigS41dAz0cRpO0ZeJ10qPJ2o8b5J7FlUAxkSlkrF9ymRx4JPP9c2xeCf6ld gHHbHNnlDCN4tADpYqPPI+jPM2vG8UyZ62y2iNiOsZlfng9gWEAothqfWR7jGA== 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 4V1NYy12PGz1Kxk; Fri, 22 Mar 2024 13:33:10 +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 42MDXAKN002916; Fri, 22 Mar 2024 13:33:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDXACM002913; Fri, 22 Mar 2024 13:33:10 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:10 GMT Message-Id: <202403221333.42MDXACM002913@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: be83aa2a01b3 - stable/14 - libcasper: 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: be83aa2a01b35f9e7aa94a3d45a851305fa22c83 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=be83aa2a01b35f9e7aa94a3d45a851305fa22c83 commit be83aa2a01b35f9e7aa94a3d45a851305fa22c83 Author: Ed Maste AuthorDate: 2024-02-15 00:42:48 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 libcasper: 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: faaf43b2a750 ("fileargs: add tests") Sponsored by: The FreeBSD Foundation (cherry picked from commit 3733d82c4deb49035a39e18744085d1e3e9b8dc5) --- .../services/cap_fileargs/tests/fileargs_test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c index 4df43f183735..dce499c8b7c3 100644 --- a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c +++ b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c @@ -292,7 +292,7 @@ ATF_TC_BODY(fileargs__open_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -339,7 +339,7 @@ ATF_TC_BODY(fileargs__open_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -386,7 +386,7 @@ ATF_TC_BODY(fileargs__open_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL | CAP_READ); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL, CAP_READ); cap_rights_init(&norights, CAP_FCHMOD); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 666, &rights, FA_OPEN); @@ -467,7 +467,7 @@ ATF_TC_BODY(fileargs__fopen_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -517,7 +517,7 @@ ATF_TC_BODY(fileargs__fopen_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -567,7 +567,7 @@ ATF_TC_BODY(fileargs__fopen_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_READ | CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_WRITE, CAP_FCNTL); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 0, &rights, FA_OPEN); ATF_REQUIRE(fa != NULL); @@ -673,7 +673,7 @@ ATF_TC_BODY(fileargs__open_lstat, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_LSTAT); @@ -721,7 +721,7 @@ ATF_TC_BODY(fileargs__open_realpath, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_REALPATH);