about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2022-08-08 09:22:44 +0100
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2022-10-12 14:22:03 +0100
commit55ada9157de78b614f56169643942f31d36b0035 (patch)
tree1f76d325d58dde65ab8c345839785c6ded780cb5
parent11e0080cd54f35d11ed45ba18a52419608203ad8 (diff)
downloadglibc-55ada9157de78b614f56169643942f31d36b0035.tar.gz
glibc-55ada9157de78b614f56169643942f31d36b0035.tar.xz
glibc-55ada9157de78b614f56169643942f31d36b0035.zip
cheri: elf: add an RW capability to link_map
For each module keep an RX and an RW root capability.  Use the existing
l_map_start for RX (covering all load segments) and add l_rw_start for
RW (covering all writable load segments).

For relocation processing, we also need individual RW ranges to decide
which objects need to be derived from RW and RX capabilities.  In
practice most modules have exactly one RW segment and it's unlikely
that any module needs more than four distinct ranges to tightly cover
the RW mappings.

Only added on CHERI targets so always has to be used behind ifdef.
-rw-r--r--include/link.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/link.h b/include/link.h
index 6dd8e712c4..e1dca89762 100644
--- a/include/link.h
+++ b/include/link.h
@@ -257,6 +257,18 @@ struct link_map
     ElfW(Addr) l_map_end;
     /* End of the executable part of the mapping.  */
     ElfW(Addr) l_text_end;
+#ifdef __CHERI_PURE_CAPABILITY__
+    /* Writable part of the mapping (may have non-writable holes).  */
+    elfptr_t l_rw_start;
+# define DL_MAX_RW_COUNT 4
+    /* Writable ranges: objects are writable in these ranges.  */
+    int l_rw_count;
+    struct rw_range
+    {
+      ElfW(Addr) start;
+      ElfW(Addr) end;
+    } l_rw_range[DL_MAX_RW_COUNT];
+#endif
 
     /* Default array for 'l_scope'.  */
     struct r_scope_elem *l_scope_mem[4];