diff options
author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2021-03-09 14:04:49 +0000 |
---|---|---|
committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2021-03-26 11:03:06 +0000 |
commit | 4eac0ab1867c48fac13b65d997102c8aaa4447f9 (patch) | |
tree | cdbc743902501beb5e15dee642070c0cda63daf1 /malloc/hooks.c | |
parent | 14652f60a425458ad6e8eefdae6ff4003124b321 (diff) | |
download | glibc-4eac0ab1867c48fac13b65d997102c8aaa4447f9.tar.gz glibc-4eac0ab1867c48fac13b65d997102c8aaa4447f9.tar.xz glibc-4eac0ab1867c48fac13b65d997102c8aaa4447f9.zip |
malloc: Use chunk2rawmem throughout
The difference between chunk2mem and chunk2rawmem is that the latter does not get the memory tag for the returned pointer. It turns out chunk2rawmem almost always works: The input of chunk2mem is a chunk pointer that is untagged so it can access the chunk header. All memory that is not user allocated heap memory is untagged, which in the current implementation means that it has the 0 tag, but this patch does not rely on the tag value. The patch relies on that chunk operations are either done on untagged chunks or without doing memory access to the user owned part. Internal interface contracts: sysmalloc: Returns untagged memory. _int_malloc: Returns untagged memory. _int_free: Takes untagged memory. _int_memalign: Returns untagged memory. _int_realloc: Takes and returns tagged memory. So only _int_realloc and functions outside this list need care. Alignment checks do not need the right tag and tcache works with untagged memory. tag_at was kept in realloc after an mremap, which is not strictly necessary, since the pointer is only used to retag the memory, but this way the tag is guaranteed to be different from the old tag. Reviewed-by: DJ Delorie <dj@redhat.com>
Diffstat (limited to 'malloc/hooks.c')
-rw-r--r-- | malloc/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc/hooks.c b/malloc/hooks.c index b82ff5781b..e888adcdc3 100644 --- a/malloc/hooks.c +++ b/malloc/hooks.c @@ -330,7 +330,7 @@ realloc_check (void *oldmem, size_t bytes, const void *caller) #if HAVE_MREMAP mchunkptr newp = mremap_chunk (oldp, chnb); if (newp) - newmem = chunk2mem (newp); + newmem = tag_at (chunk2rawmem (newp)); else #endif { |