vm: Do not issue PERM_SYSCALL as part of CHERI_CAP_USER_DATA_PERMS.

Author: qwattash

bin/cheribsdtest/cheribsdtest_registers.c

@@ -315,18 +315,18 @@ CHERIBSDTEST(initregs_default, "Test initial value of default capability")
  */
 
 #define	CHERI_STACK_USE_MAX	(256 * 1024)
+#define	CHERI_STACK_SWPERMS						\
+	(CHERI_PERMS_SWALL & ~(CHERI_PERM_SW_VMEM | CHERI_PERM_SYSCALL))
 
 CHERIBSDTEST(initregs_stack_user_perms,
     "Test user permissions of stack capability")
 {
 	register_t v;
 
 	v = cheri_perms_get(cheri_stack_get());
-	if ((v & CHERI_PERMS_SWALL) !=
-	    (CHERI_PERMS_SWALL & ~CHERI_PERM_SW_VMEM))
+	if ((v & CHERI_PERMS_SWALL) != CHERI_STACK_SWPERMS)
 		cheribsdtest_failure_errx("swperms %jx (expected swperms %x)",
-		    v & CHERI_PERMS_SWALL,
-		    (CHERI_PERMS_SWALL & ~CHERI_PERM_SW_VMEM));
+		    v & CHERI_PERMS_SWALL, CHERI_STACK_SWPERMS);
 	cheribsdtest_success();
 }
 

sys/cheri/cherireg.h

@@ -88,7 +88,8 @@
 #define	CHERI_CAP_USER_CODE_LENGTH	(VM_MAXUSER_ADDRESS - VM_MINUSER_ADDRESS)
 #define	CHERI_CAP_USER_CODE_OFFSET	0x0
 
-#define	CHERI_CAP_USER_DATA_PERMS	CHERI_PERMS_USERSPACE_DATA
+#define	CHERI_CAP_USER_DATA_PERMS				\
+	(CHERI_PERMS_USERSPACE_DATA & ~CHERI_PERM_SYSCALL)
 #define	CHERI_CAP_USER_DATA_BASE	VM_MINUSER_ADDRESS
 #define	CHERI_CAP_USER_DATA_LENGTH	(VM_MAXUSER_ADDRESS - VM_MINUSER_ADDRESS)
 #define	CHERI_CAP_USER_DATA_OFFSET	0x0