aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
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 /stdio-common
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 'stdio-common')
-rw-r--r--stdio-common/reg-modifier.c3
-rw-r--r--stdio-common/reg-printf.c6
-rw-r--r--stdio-common/reg-type.c6
3 files changed, 10 insertions, 5 deletions
diff --git a/stdio-common/reg-modifier.c b/stdio-common/reg-modifier.c
index b911aea..a52022d 100644
--- a/stdio-common/reg-modifier.c
+++ b/stdio-common/reg-modifier.c
@@ -183,7 +183,8 @@ __handle_registered_modifier_wc (const unsigned int **format,
}
-libc_freeres_fn (free_mem)
+void
+__libc_printf_freemem (void)
{
if (__printf_modifier_table != NULL)
{
diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c
index 3ec81e6..0d14ac6 100644
--- a/stdio-common/reg-printf.c
+++ b/stdio-common/reg-printf.c
@@ -21,11 +21,11 @@
#include <stddef.h>
#include <stdlib.h>
#include <libc-lock.h>
+#include <set-freeres.h>
/* Array of functions indexed by format character. */
-libc_freeres_ptr (printf_arginfo_size_function **__printf_arginfo_table)
- attribute_hidden;
+printf_arginfo_size_function **__printf_arginfo_table attribute_hidden;
printf_function **__printf_function_table attribute_hidden;
__libc_lock_define_initialized (static, lock)
@@ -79,3 +79,5 @@ __register_printf_function (int spec, printf_function converter,
(printf_arginfo_size_function*) arginfo);
}
weak_alias (__register_printf_function, register_printf_function)
+
+weak_alias (__printf_arginfo_table, __libc_reg_printf_freemem_ptr)
diff --git a/stdio-common/reg-type.c b/stdio-common/reg-type.c
index 02edac4..980a911 100644
--- a/stdio-common/reg-type.c
+++ b/stdio-common/reg-type.c
@@ -19,11 +19,11 @@
#include <printf.h>
#include <stdlib.h>
#include <libc-lock.h>
+#include <set-freeres.h>
/* Array of functions indexed by format character. */
-libc_freeres_ptr (printf_va_arg_function **__printf_va_arg_table)
- attribute_hidden;
+printf_va_arg_function **__printf_va_arg_table attribute_hidden;
__libc_lock_define_initialized (static, lock);
@@ -59,3 +59,5 @@ __register_printf_type (printf_va_arg_function fct)
return result;
}
weak_alias (__register_printf_type, register_printf_type)
+
+weak_alias (__printf_va_arg_table, __libc_reg_type_freemem_ptr)