From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 460463854831; Wed, 26 Oct 2022 14:48:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 460463854831 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666795739; bh=kC6xwHOog2rtAlSvXHurvb5+zeMlru6+4k49rosJnfc=; h=From:To:Subject:Date:From; b=KEy1HEGawN+gTz8KoBPjgaUni3FqRpBM0pIuoKaRbaHuRH2jL8ZatmO0SAXKL7d7y B3SugYO0PRNYe9I/fMUGlh7II8LOXS7z4mVLE0HuC83gEsNpRiq5k221q/iubsu/p7 aeyBxnd5KvH+vG9kt1sOtTkckRa+WHdTI46ZRLYg= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] TODO: update cheri_perms.h X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 78412dcc6a173726a3db78c8a0626aec2f1dd42a X-Git-Newrev: 28f19db3b85abd039734b55b29acc22897b88302 Message-Id: <20221026144859.460463854831@sourceware.org> Date: Wed, 26 Oct 2022 14:48:53 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=28f19db3b85abd039734b55b29acc22897b88302 commit 28f19db3b85abd039734b55b29acc22897b88302 Author: Szabolcs Nagy Date: Mon Oct 24 11:53:56 2022 +0100 TODO: update cheri_perms.h TODO: squash into initial cheri_perms.h Diff: --- sysdeps/aarch64/morello/cheri_perms.h | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/sysdeps/aarch64/morello/cheri_perms.h b/sysdeps/aarch64/morello/cheri_perms.h index 8c44233016..98a1926ad9 100644 --- a/sysdeps/aarch64/morello/cheri_perms.h +++ b/sysdeps/aarch64/morello/cheri_perms.h @@ -30,6 +30,8 @@ #define CAP_PERM_STORE_LOCAL (1 << 12) #define CAP_PERM_SEAL (1 << 11) #define CAP_PERM_UNSEAL (1 << 10) +#define CAP_PERM_SYSTEM (1 << 9) +#define CAP_PERM_BRANCH_SEALED_PAIR (1 << 8) #define CAP_PERM_COMPARTMENT_ID (1 << 7) #define CAP_PERM_MUTABLE_LOAD (1 << 6) #define CAP_PERM_EXECUTIVE (1 << 1) @@ -41,13 +43,29 @@ CAP_PERM_STORE | \ CAP_PERM_EXECUTE | \ CAP_PERM_LOAD_CAP | \ + CAP_PERM_MUTABLE_LOAD | \ CAP_PERM_STORE_CAP | \ + CAP_PERM_STORE_LOCAL | \ + CAP_PERM_EXECUTIVE | \ + CAP_PERM_SYSTEM | \ CAP_PERM_SEAL | \ CAP_PERM_UNSEAL | \ CAP_PERM_COMPARTMENT_ID)) -#define CAP_PERM_MASK_R (CAP_PERM_MASK_BASE | CAP_PERM_LOAD | CAP_PERM_LOAD_CAP) -#define CAP_PERM_MASK_RW (CAP_PERM_MASK_R | CAP_PERM_STORE | CAP_PERM_STORE_CAP) -#define CAP_PERM_MASK_RX (CAP_PERM_MASK_R | CAP_PERM_EXECUTE) +#define CAP_PERM_MASK_R ( \ + CAP_PERM_MASK_BASE | \ + CAP_PERM_LOAD | \ + CAP_PERM_LOAD_CAP | \ + CAP_PERM_MUTABLE_LOAD) +#define CAP_PERM_MASK_RW ( \ + CAP_PERM_MASK_R | \ + CAP_PERM_STORE | \ + CAP_PERM_STORE_CAP | \ + CAP_PERM_STORE_LOCAL) +#define CAP_PERM_MASK_RX ( \ + CAP_PERM_MASK_R | \ + CAP_PERM_EXECUTE | \ + CAP_PERM_EXECUTIVE | \ + CAP_PERM_SYSTEM) #define STACK_CAP_PERM_PCS ( \ CAP_PERM_LOAD | \