lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

malloc: preserve errno on mcheck hooks [BZ #17924]

Browse Source 
Similar to the fix 69fda43b8d, save and restore errno for the hook
functions used for MALLOC_CHECK_=3.

It fixes the malloc/tst-free-errno-mcheck regression.

Checked on x86_64-linux-gnu.
This commit is contained in:
Adhemerval Zanella
2020-12-29 17:12:21 -03:00
parent 38a033ac85
commit 9835632cf4
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
malloc/hooks.c
View File

@ -260,6 +260,8 @@ free_check (void *mem, const void *caller)
if (!mem) if (!mem)
return; return;
int err = errno;
#ifdef USE_MTAG #ifdef USE_MTAG
/* Quickly check that the freed pointer matches the tag for the memory. /* Quickly check that the freed pointer matches the tag for the memory.
This gives a useful double-free detection. */ This gives a useful double-free detection. */
@ -274,12 +276,16 @@ free_check (void *mem, const void *caller)
{ {
__libc_lock_unlock (main_arena.mutex); __libc_lock_unlock (main_arena.mutex);
munmap_chunk (p); munmap_chunk (p);
return;
} }
/* Mark the chunk as belonging to the library again. */ else
(void)TAG_REGION (chunk2rawmem (p), CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); {
_int_free (&main_arena, p, 1); /* Mark the chunk as belonging to the library again. */
__libc_lock_unlock (main_arena.mutex); (void)TAG_REGION (chunk2rawmem (p), CHUNK_AVAILABLE_SIZE (p)
- CHUNK_HDR_SZ);
_int_free (&main_arena, p, 1);
__libc_lock_unlock (main_arena.mutex);
}
__set_errno (err);
} }
static void * static void *