From nobody Fri Mar 22 13:36:28 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 4V1Ndm5j2dz5DxHS; Fri, 22 Mar 2024 13:36:28 +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 4V1Ndm1yThz47RR; Fri, 22 Mar 2024 13:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114588; 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=Y6Se6q2MzNNoG2kHBbdlSSf4D6ejUvQ8akMRY35I+Z0=; b=TByvZlULaJDB3uRs2bMP/kp9MAzGDR4p+gKitV7UqaSMjWQWZhWFDQXy+RUE4wZtd3mlws kXkdWODi9Mxu31ZW/4opf66lsBU7tnYNAxQUdO6HkCX2jXxBQ/EXbsXn4sZFovWyJiLTVv Qk1XLu2Vaj2vnry2fDI6R47C0WnNTgZoU8kxF/BgdIKRSqQlci3C6LJel2K6vCDpxIXDch Nf1vgSiTLjjCOp5sV6bd9mJR9wslXaKDnt2Hy5N15IAKLPoxu8khXbpVi/xlbbJlPHSijO J64EP169uxfaOfHda6Pf23TX7F3fRsXUgwO8BUd1JHIPB4bCEjchovwWee825g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114588; a=rsa-sha256; cv=none; b=jKGRYAtkowvfXGO2u0gvq4srMq0jgkRjUftk1LLCtkUkP7kriHbJ9cp8cGArNtxrlA5+GL OiWKYMqy8dSydg0txejju3bgK0rGOLDIvfr0KbYdydu8vAav8WgomiUgO7P4B6whcoX40R E9uD+SbKQjVM28dzba4q9vCBdSfo8P1nplY8ozAOGXBRpSoGSsq98OZm9k43AhmCUK1Rfo xkPmT7fn6sM3I7vKfO3+ch6QHMvaDvwUuYn7zkrQK06kxm3ZYtKuDRmSdpr5RVFBUCcF9m COzy7b9P8hHuJiDMUau1PSnevnIvNNyYzp5yDtYJ27fhTE6FlfonbBtLPRE9Fw== 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=1711114588; 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=Y6Se6q2MzNNoG2kHBbdlSSf4D6ejUvQ8akMRY35I+Z0=; b=Aw22HP53talFFm804AdAPuuNJca/lXeAwgnZyKBj/HJIFeBCYT+dH1n4qgu10pqMbVAiX5 G1oo1IRPBD5gjNu8UUVEBvD3GKRwAGvpmkzoPBPj/Ae5hGiVAu5FOFC/5gvqJgfwxau3w7 8tVyF2I3MRO58iEy54Z8KEsnsGVnY38JNvrl+rxFmqXGM8WhPfjRXq3dH0E8Fae+EzTT4u YCd4GglyuRIq6pSbbaQ6+XeKiy0KbxQPBnv+ZgDf111klab38VyrxCLkGr5QQGSytBaR4E PjaR6wrF4wfPUNSX7uWBQFJOFDiXh4tmNukibakZDP807B+OpUu1iaJc443CLw== 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 4V1Ndm1XZKz1LTZ; Fri, 22 Mar 2024 13:36:28 +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 42MDaSQE003841; Fri, 22 Mar 2024 13:36:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDaSKV003839; Fri, 22 Mar 2024 13:36:28 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:36:28 GMT Message-Id: <202403221336.42MDaSKV003839@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: ec44cc4e2882 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: ec44cc4e28824b83b2b53b4afd39663345823613 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ec44cc4e28824b83b2b53b4afd39663345823613 commit ec44cc4e28824b83b2b53b4afd39663345823613 Author: Ed Maste AuthorDate: 2024-02-15 00:42:48 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:35:44 +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) (cherry picked from commit be83aa2a01b35f9e7aa94a3d45a851305fa22c83) --- .../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 0b4857f6ed07..a9f2dd90e1af 100644 --- a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c +++ b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c @@ -281,7 +281,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); @@ -326,7 +326,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); @@ -371,7 +371,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); @@ -448,7 +448,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); @@ -496,7 +496,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); @@ -544,7 +544,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); @@ -646,7 +646,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); @@ -692,7 +692,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);