From nobody Thu Feb 15 00:38:47 2024 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 4TZx541sprz54ytQ; Thu, 15 Feb 2024 00:38:48 +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 4TZx540f25z4SjL; Thu, 15 Feb 2024 00:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707957528; 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=g2rotSoldAqOWStJWZKEP+C0/3osFt6+a23Dqs+yLuc=; b=yR24dFjbEEZznDb0DEPcBHNxW8y+ZoQshj+/nYcMKCY04bS0YF8k8YcdgBPYzkvTDOzp36 V08Ay6es2U1HQzLeAuN/PaBTMIxpS74KIAK5JLbI7UDYrmq2zIz0Cr3cHmzG+thR/YO6vA tzSNowlLYd0RyxOm1/uKRoNd2AlVMd/Zzk+l3zX0tTHHy+9q/KeHyJy8kBV4P2sknCcIRT 1fUcDGAKrPIiMCMGoglNgvuAIXUC2+cjzSVkXOnMzSXdcLMYx1f8qPRkObaZu7WvTnEPro 95x4etLZIuDzXO9YGD69Li0/e8ksaf1+XsMdaZuNpYXRdp6yF5eBKEwQxi5mYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707957528; a=rsa-sha256; cv=none; b=n1RnyHSs4lMfDMsQGRH61fAS/wbNgiVniXd/0l+DPQFTBgxYz+aofQicpU8kcSiWy/Bc8C oLAecspxz0YvLlV5gI480/rVfN0aRwPFZ0YzhF9OYMGrMYkxZ9nLWrK2ooJKbqOdlvIowj P/2ci18dxZw4yK5IB7QqyPS4OKraxBLjMprSpFWq3DSV+JmvV29Q79zDFxMqddN8AbKuUu d4iuaGqABSswuAX2dwrMMeVEDssZ1m7rWrHvsB4OFDBxiRk6Bcamd6UjpHFp6fcVk0IpVA GXc/FkQR/b6uNdB/YwYH1/bTLrDiO16aotklUUsGmWuEDHKhdAINIxrQIiht2A== 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=1707957528; 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=g2rotSoldAqOWStJWZKEP+C0/3osFt6+a23Dqs+yLuc=; b=R1KvQ7jgt2IOR1tdoM1g1+qBe7N8VjlnQSCDTOVxQukuHwD3Cg8flGsLL2pwuywm61ixlc tBdHe653mkyxFz7ib/p630Tq8YzA/d/lfNqSDrUtqYkbcRm9dHghVCOdq2sWf37k8V+mGA /+5qoCy7YljEf15H9A+R6LMNNkPVqXU/Ian5zBF7WyOUYjakHun8DWuSRUjgTAJPMlstDT uWDuBvdBRhT2CwoPky4wdUmLxlu/Uk7ty3S5fZjH/l5EK9z5Ws46e0Mwo41NFXiSEsq/JZ el0RNKg1+zi4H+VvE/PUxuluG89+0K6iw/8hhWfUbr8I+YL2u6AEtVen4WfmKQ== 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 4TZx536Y8zzKch; Thu, 15 Feb 2024 00:38:47 +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 41F0clbp054779; Thu, 15 Feb 2024 00:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41F0clRI054776; Thu, 15 Feb 2024 00:38:47 GMT (envelope-from git) Date: Thu, 15 Feb 2024 00:38:47 GMT Message-Id: <202402150038.41F0clRI054776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 05f530f4d2bb - main - cat: fix cap_rights_init usage 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05f530f4d2bb15fda3d258b3bd92d4515d9ef39f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=05f530f4d2bb15fda3d258b3bd92d4515d9ef39f commit 05f530f4d2bb15fda3d258b3bd92d4515d9ef39f Author: Ed Maste AuthorDate: 2024-02-15 00:03:40 +0000 Commit: Ed Maste CommitDate: 2024-02-15 00:37:54 +0000 cat: 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 Reported by: asomers, markj --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index c3812c6d9ca4..5dceb1cad94b 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -141,7 +141,7 @@ init_casper(int argc, char *argv[]) err(EXIT_FAILURE, "unable to create Casper"); fa = fileargs_cinit(casper, argc, argv, O_RDONLY, 0, - cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL | CAP_SEEK), + cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_FCNTL, CAP_SEEK), FA_OPEN | FA_REALPATH); if (fa == NULL) err(EXIT_FAILURE, "unable to create fileargs");