cheri: don't use dl_random for pointer mangling

Pointer mangling cannot be supported on capability architectures.
And there is not enough bytes in dl_random for 128 bit pointers.

Stack guard is still loaded from dl_random: stack protection is
unlikely to be useful on a capability architecture, but it works.

diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h
index 7888915f12ed44f52fad5829966f790a981bab34..b4104e053958291efa33b4eb5c43fb34726f946e 100644 (file)
--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -48,7 +48,12 @@ _dl_setup_stack_chk_guard (void *dl_random)
 static inline uintptr_t __attribute__ ((always_inline))
 _dl_setup_pointer_guard (void *dl_random, uintptr_t stack_chk_guard)
 {
+#ifdef __CHERI_PURE_CAPABILITY__
+  /* Pointer mangling is not supported on capability architectures.  */
+  return 0;
+#else
   uintptr_t ret;
   memcpy (&ret, (char *) dl_random + sizeof (ret), sizeof (ret));
   return ret;
+#endif
 }