diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-09-06 09:08:25 +0100 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-10-12 14:22:03 +0100 |
| commit | 9912e5c608b276588a0e83926353c0632f516a02 (patch) | |
| tree | f24b5f1aaaeba9a7faa9c89adbe22dbde08e7213 | |
| parent | e841326457b09c3d6af9634fe918a47d61113b04 (diff) | |
| download | glibc-9912e5c608b276588a0e83926353c0632f516a02.tar glibc-9912e5c608b276588a0e83926353c0632f516a02.tar.gz glibc-9912e5c608b276588a0e83926353c0632f516a02.tar.bz2 glibc-9912e5c608b276588a0e83926353c0632f516a02.zip | |
cheri: fix SYMBOL_ADDRESS to return RX derived pointer
All symbol addresses can be derived from the RX capability of the
module (l_map_start). For RW object symbols pointer will have to
be rederived from l_rw_start.
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 9cded5fdbf..3cb35dbb93 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -121,13 +121,16 @@ dl_rw_ptr (const struct link_map *l, ElfW(Addr) vaddr) typedef struct link_map *lookup_t; #define LOOKUP_VALUE(map) map #define LOOKUP_VALUE_ADDRESS(map, set) ((set) || (map) ? (map)->l_addr : 0) +#define LOOKUP_VALUE_START(map, set) ((set) || (map) ? (map)->l_map_start : 0) /* Calculate the address of symbol REF using the base address from map MAP, if non-NULL. Don't check for NULL map if MAP_SET is TRUE. */ #define SYMBOL_ADDRESS(map, ref, map_set) \ ((ref) == NULL ? 0 \ - : (__glibc_unlikely ((ref)->st_shndx == SHN_ABS) ? 0 \ - : LOOKUP_VALUE_ADDRESS (map, map_set)) + (ref)->st_value) + : (__glibc_unlikely ((ref)->st_shndx == SHN_ABS) ? (ref)->st_value \ + : dl_get_ptr (LOOKUP_VALUE_START (map, map_set), \ + LOOKUP_VALUE_ADDRESS (map, map_set), \ + (ref)->st_value))) /* Type of a constructor function, in DT_INIT, DT_INIT_ARRAY, DT_PREINIT_ARRAY. */ |