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 /nss/getXXent.c | |
| parent | e4d336f1ace7c7ca535f7f85485373752bc76ed5 (diff) | |
| download | glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.gz | |
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>
Diffstat (limited to 'nss/getXXent.c')
| -rw-r--r-- | nss/getXXent.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nss/getXXent.c b/nss/getXXent.c index 7ac8379fbc..8acb6dc54f 100644 --- a/nss/getXXent.c +++ b/nss/getXXent.c @@ -18,6 +18,7 @@ #include <errno.h> #include <libc-lock.h> #include <stdlib.h> +#include <set-freeres.h> #include "nsswitch.h" @@ -43,6 +44,9 @@ #define APPEND_R1(name) name##_r #define INTERNAL(name) INTERNAL1 (name) #define INTERNAL1(name) __##name +#define APPEND_FREEMEM_NAME1(name) __libc_##name##_freemem_ptr +#define APPEND_FREEMEM_NAME(name) APPEND_FREEMEM_NAME1(name) +#define FREEMEM_NAME APPEND_FREEMEM_NAME (GETFUNC_NAME) /* Sometimes we need to store error codes in the `h_errno' variable. */ #ifdef NEED_H_ERRNO @@ -62,8 +66,9 @@ extern int INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, __libc_lock_define_initialized (static, lock); /* This points to the static buffer used. */ -libc_freeres_ptr (static char *buffer); +static char *buffer; +weak_alias (buffer, FREEMEM_NAME) LOOKUP_TYPE * GETFUNC_NAME (void) |