sys: Adjust support for bounded code pointers

Prepare for preferring the bounds from cap relocs and relative ELF
relocations when PT_CHERI_PCC is present.  For now the bounds are
always disabled, but this provides the hooks to enable this in the
future when support for PT_CHERI_PCC is added to the kernel linker.

Author: bsdjhb

sys/arm64/arm64/elf_machdep.c

@@ -396,13 +396,16 @@ decode_fragment(Elf_Addr *fragment, Elf_Addr relocbase, Elf_Addr *addrp,
 
 static uintcap_t __nosanitizecoverage
 build_reloc_cap(Elf_Addr addr, Elf_Addr size, uint8_t perms, Elf_Addr offset,
-    void * __capability data_cap, const void * __capability code_cap)
+    void * __capability data_cap, const void * __capability code_cap,
+    bool use_code_bounds)
 {
 	uintcap_t cap;
 
 	cap = perms == MORELLO_FRAG_EXECUTABLE ?
 	    (uintcap_t)code_cap : (uintcap_t)data_cap;
 	cap = cheri_setaddress(cap, addr);
+	if (perms != MORELLO_FRAG_EXECUTABLE || use_code_bounds)
+		cap = cheri_setbounds(cap, size);
 
 	if (perms == MORELLO_FRAG_EXECUTABLE ||
 	    perms == MORELLO_FRAG_RODATA) {
@@ -414,7 +417,6 @@ build_reloc_cap(Elf_Addr addr, Elf_Addr size, uint8_t perms, Elf_Addr offset,
 	    perms == MORELLO_FRAG_RODATA) {
 		cap = cheri_clearperm(cap, CHERI_PERM_SEAL |
 		    CHERI_PERM_EXECUTE);
-		cap = cheri_setbounds(cap, size);
 	}
 	cap += offset;
 	if (perms == MORELLO_FRAG_EXECUTABLE) {
@@ -429,13 +431,15 @@ build_reloc_cap(Elf_Addr addr, Elf_Addr size, uint8_t perms, Elf_Addr offset,
 #ifdef __CHERI_PURE_CAPABILITY__
 static uintcap_t __nosanitizecoverage
 build_cap_from_fragment(Elf_Addr *fragment, Elf_Addr relocbase, Elf_Addr offset,
-    void * __capability data_cap, const void * __capability code_cap)
+    void * __capability data_cap, const void * __capability code_cap,
+    bool use_code_bounds)
 {
 	Elf_Addr addr, size;
 	uint8_t perms;
 
 	decode_fragment(fragment, relocbase, &addr, &size, &perms);
-	return (build_reloc_cap(addr, size, perms, offset, data_cap, code_cap));
+	return (build_reloc_cap(addr, size, perms, offset, data_cap, code_cap,
+	    use_code_bounds));
 }
 #endif
 #endif
@@ -516,7 +520,7 @@ elf_reloc_internal(linker_file_t lf, char *relocbase, const void *data,
 			    (val == addr1 ? relocbase :
 			    linker_kernel_file->address);
 			*(uintcap_t *)(void *)where = build_reloc_cap(addr1,
-			    size, perms, addend, base, base);
+			    size, perms, addend, base, base, false);
 		}
 #endif
 		return (0);
@@ -618,7 +622,7 @@ elf_reloc_internal(linker_file_t lf, char *relocbase, const void *data,
 		} else
 			addr = build_cap_from_fragment(where,
 			    (Elf_Addr)relocbase, rela->r_addend,
-			    relocbase, relocbase);
+			    relocbase, relocbase, false);
 		addr = ((uintptr_t (*)(void))addr)();
 		*(uintptr_t *)where = addr;
 		break;
@@ -785,7 +789,7 @@ elf_reloc_self(const Elf_Dyn *dynp, void *data_cap, const void *code_cap)
 			fragment = (Elf_Addr *)cheri_setaddress(data_cap,
 			    rela->r_offset);
 			cap = build_cap_from_fragment(fragment, 0,
-			    rela->r_addend, data_cap, code_cap);
+			    rela->r_addend, data_cap, code_cap, false);
 			*((uintptr_t *)fragment) = cap;
 			break;
 		}

sys/cheri/cheri.h

@@ -179,7 +179,7 @@ typedef void (cap_relocs_cb)(void *arg, bool function, bool constant,
 
 int	init_linker_file_cap_relocs(const void *start_relocs,
 	    const void *stop_relocs, void *data_cap, ptraddr_t base_addr,
-	    cap_relocs_cb *cb, void *cb_arg);
+	    bool can_set_code_bounds, cap_relocs_cb *cb, void *cb_arg);
 #endif
 #endif /* !_KERNEL */
 

sys/cheri/cheri_cap_relocs.c

@@ -64,26 +64,16 @@ typedef void (cap_relocs_cb)(void *arg, bool function, bool constant,
 
 int	init_linker_file_cap_relocs(const void *start_relocs,
 	    const void *stop_relocs, void *data_cap, ptraddr_t base_addr,
-	    cap_relocs_cb *cb, void *cb_arg);
+	    bool can_set_code_bounds, cap_relocs_cb *cb, void *cb_arg);
 
 /* Can't include <sys/systm.h>. */
 int	printf(const char *, ...) __printflike(1, 2);
 
 int
 init_linker_file_cap_relocs(const void *start_relocs, const void *stop_relocs,
-    void *data_cap, ptraddr_t base_addr, cap_relocs_cb *cb, void *cb_arg)
+    void *data_cap, ptraddr_t base_addr, bool can_set_code_bounds,
+    cap_relocs_cb *cb, void *cb_arg)
 {
-	/*
-	 * Set code bounds if the ABI allows it.
-	 * When building for hybrid or with the pc-relative captable ABI we do
-	 * not further constrain the given code_cap.
-	 */
-#if !defined(__CHERI_PURE_CAPABILITY__) || __CHERI_CAPABILITY_TABLE__ == 3
-	bool can_set_code_bounds = false;
-#else
-	bool can_set_code_bounds = true;
-#endif
-
 	/*
 	 * This cannot use cheri_init_globals_impl directly as symbols
 	 * for kernel modules in the vnet and dpcpu sets need to use

sys/kern/link_elf.c

@@ -2194,7 +2194,7 @@ link_elf_reloc_local(linker_file_t lf)
 		data_cap = cheri_andperm(ef->mapbase, CHERI_PERMS_KERNEL_DATA);
 		if (init_linker_file_cap_relocs(ef->caprelocs,
 		    (char *)ef->caprelocs + ef->caprelocssize, data_cap,
-		    (ptraddr_t)ef->address, resolve_cap_reloc, ef) != 0)
+		    (ptraddr_t)ef->address, false, resolve_cap_reloc, ef) != 0)
 			return (ENOEXEC);
 	}
 #endif

sys/riscv/riscv/locore.S

@@ -404,8 +404,9 @@ va:
 	cincoffset ca1, ca0, t1
 	candperm ca2, cs0, t0
 	mv	a3,zero
-	cllc	ca4, _C_LABEL(kernel_cap_relocs_cb)
-	csetflags ca5, ca4, zero
+	mv	a4,zero			/* TODO: true for PT_CHERI_PCC */
+	cllc	ca5, _C_LABEL(kernel_cap_relocs_cb)
+	csetflags ca6, ca5, zero
 	cllc	cra, _C_LABEL(init_linker_file_cap_relocs)
 	cjalr	cra
 	cincoffset csp, csp, (2 * 16)