diff options
| author | Adhemerval Zanella Netto <adhemerval.zanella@linaro.org> | 2022-12-27 18:11:42 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-03-27 13:57:55 -0300 |
| commit | 88677348b4de73874ca7d5a47451f42880f65f07 (patch) | |
| tree | 9ebe22b88c2487331521737dfdf089f9e3e2439f | |
| parent | e4d336f1ace7c7ca535f7f85485373752bc76ed5 (diff) | |
| download | glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.xz glibc-88677348b4de73874ca7d5a47451f42880f65f07.zip | |
Move libc_freeres_ptrs and libc_subfreeres to hidden/weak functions
They are both used by __libc_freeres to free all library malloc
allocated resources to help tooling like mtrace or valgrind with
memory leak tracking.
The current scheme uses assembly markers and linker script entries
to consolidate the free routine function pointers in the RELRO segment
and to be freed buffers in BSS.
This patch changes it to use specific free functions for
libc_freeres_ptrs buffers and call the function pointer array directly
with call_function_static_weak.
It allows the removal of both the internal macros and the linker
script sections.
Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
90 files changed, 584 insertions, 243 deletions
@@ -560,14 +560,7 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules -Wl,--verbose 2>/dev/null | \ sed > $@T \ -e '/^=========/,/^=========/!d;/^=========/d' \ - -e 's/^.*\*(\.dynbss).*$$/& \ - PROVIDE(__start___libc_freeres_ptrs = .); \ - *(__libc_freeres_ptrs) \ - PROVIDE(__stop___libc_freeres_ptrs = .);/'\ -e 's@^.*\*(\.jcr).*$$@& \ - PROVIDE(__start___libc_subfreeres = .);\ - __libc_subfreeres : { *(__libc_subfreeres) }\ - PROVIDE(__stop___libc_subfreeres = .);\ PROVIDE(__start___libc_IO_vtables = .);\ __libc_IO_vtables : { *(__libc_IO_vtables) }\ PROVIDE(__stop___libc_IO_vtables = .);\ diff --git a/crypt/md5-crypt.c b/crypt/md5-crypt.c index 0cc597a7f2..4e4760545a 100644 --- a/crypt/md5-crypt.c +++ b/crypt/md5-crypt.c @@ -299,10 +299,7 @@ __md5_crypt_r (const char *key, const char *salt, char *buffer, int buflen) return buffer; } -#ifndef _LIBC -# define libc_freeres_ptr(decl) decl -#endif -libc_freeres_ptr (static char *buffer); +static char *buffer; char * __md5_crypt (const char *key, const char *salt) @@ -326,11 +323,9 @@ __md5_crypt (const char *key, const char *salt) return __md5_crypt_r (key, salt, buffer, buflen); } -#ifndef _LIBC static void __attribute__ ((__destructor__)) free_mem (void) { free (buffer); } -#endif diff --git a/crypt/sha256-crypt.c b/crypt/sha256-crypt.c index 1ef16af80f..e90eb590bb 100644 --- a/ |