From 28f19db3b85abd039734b55b29acc22897b88302 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Mon, 24 Oct 2022 11:53:56 +0100 Subject: TODO: update cheri_perms.h TODO: squash into initial cheri_perms.h --- 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 | \ -- cgit 1.4.1