aboutsummaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorAdhemerval Zanella Netto <adhemerval.zanella@linaro.org>2022-12-27 18:11:42 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2023-03-27 13:57:55 -0300
commit88677348b4de73874ca7d5a47451f42880f65f07 (patch)
tree9ebe22b88c2487331521737dfdf089f9e3e2439f /nscd
parente4d336f1ace7c7ca535f7f85485373752bc76ed5 (diff)
downloadglibc-88677348b4de73874ca7d5a47451f42880f65f07.zip
glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.gz
glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.bz2
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 'nscd')
-rw-r--r--nscd/nscd_getgr_r.c3
-rw-r--r--nscd/nscd_gethst_r.c3
-rw-r--r--nscd/nscd_getpw_r.c3
-rw-r--r--nscd/nscd_getserv_r.c3
-rw-r--r--nscd/nscd_netgroup.c3
5 files changed, 10 insertions, 5 deletions
diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c
index f30d999..07e8940 100644
--- a/nscd/nscd_getgr_r.c
+++ b/nscd/nscd_getgr_r.c
@@ -68,7 +68,8 @@ libc_locked_map_ptr (,__gr_map_handle) attribute_hidden;
/* Note that we only free the structure if necessary. The memory
mapping is not removed since it is not visible to the malloc
handling. */
-libc_freeres_fn (gr_map_free)
+void
+__nscd_gr_map_freemem (void)
{
if (__gr_map_handle.mapped != NO_MAPPING)
{
diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
index ab9c9d3..c6a6247 100644
--- a/nscd/nscd_gethst_r.c
+++ b/nscd/nscd_gethst_r.c
@@ -81,7 +81,8 @@ libc_locked_map_ptr (, __hst_map_handle) attribute_hidden;
/* Note that we only free the structure if necessary. The memory
mapping is not removed since it is not visible to the malloc
handling. */
-libc_freeres_fn (hst_map_free)
+void
+__nscd_hst_map_freemem (void)
{
if (__hst_map_handle.mapped != NO_MAPPING)
{
diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c
index 0cae7ad..17d9753 100644
--- a/nscd/nscd_getpw_r.c
+++ b/nscd/nscd_getpw_r.c
@@ -67,7 +67,8 @@ libc_locked_map_ptr (static, map_handle);
/* Note that we only free the structure if necessary. The memory
mapping is not removed since it is not visible to the malloc
handling. */
-libc_freeres_fn (pw_map_free)
+void
+__nscd_pw_map_freemem (void)
{
if (map_handle.mapped != NO_MAPPING)
{
diff --git a/nscd/nscd_getserv_r.c b/nscd/nscd_getserv_r.c
index 6969fcb..1458c6c 100644
--- a/nscd/nscd_getserv_r.c
+++ b/nscd/nscd_getserv_r.c
@@ -62,7 +62,8 @@ libc_locked_map_ptr (, __serv_map_handle) attribute_hidden;
/* Note that we only free the structure if necessary. The memory
mapping is not removed since it is not visible to the malloc
handling. */
-libc_freeres_fn (serv_map_free)
+void
+__nscd_serv_map_freemem (void)
{
if (__serv_map_handle.mapped != NO_MAPPING)
{
diff --git a/nscd/nscd_netgroup.c b/nscd/nscd_netgroup.c
index 29cd3a5..6f4c383 100644
--- a/nscd/nscd_netgroup.c
+++ b/nscd/nscd_netgroup.c
@@ -31,7 +31,8 @@ libc_locked_map_ptr (static, map_handle);
/* Note that we only free the structure if necessary. The memory
mapping is not removed since it is not visible to the malloc
handling. */
-libc_freeres_fn (pw_map_free)
+void
+__nscd_group_map_freemem (void)
{
if (map_handle.mapped != NO_MAPPING)
{