mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 08:30:00 +00:00
2827ab990a
The __libc_freeres framework does not extend to non-libc.so objects. This causes problems in general for valgrind and mtrace detecting unfreed objects in both libdl.so and libpthread.so. This change is a pre-requisite to properly moving the malloc hooks out of malloc since such a move now requires precise accounting of all allocated data before destructors are run. This commit adds a proper hook in libc.so.6 for both libdl.so and for libpthread.so, this ensures that shm-directory.c which uses freeit () to free memory is called properly. We also remove the nptl_freeres hook and fall back to using weak-ref-and-check idiom for a loaded libpthread.so, thus making this process similar for all DSOs. Lastly we follow best practice and use explicit free calls for both libdl.so and libpthread.so instead of the generic hook process which has undefined order. Tested on x86_64 with no regressions. Signed-off-by: DJ Delorie <dj@redhat.com> Signed-off-by: Carlos O'Donell <carlos@redhat.com>
72 lines
2.4 KiB
C
72 lines
2.4 KiB
C
/* Macros for using symbol sets for running lists of functions.
|
|
Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _SET_HOOKS_H
|
|
#define _SET_HOOKS_H 1
|
|
|
|
#define __need_size_t
|
|
#include <stddef.h>
|
|
#include <sys/cdefs.h>
|
|
#include <libc-symbols.h>
|
|
|
|
#ifdef symbol_set_define
|
|
/* Define a hook variable called NAME. Functions put on this hook take
|
|
arguments described by PROTO. Use `text_set_element (NAME, FUNCTION)'
|
|
from include/libc-symbols.h to add a function to the hook. */
|
|
|
|
# define DEFINE_HOOK(NAME, PROTO) \
|
|
typedef void __##NAME##_hook_function_t PROTO; \
|
|
symbol_set_define (NAME)
|
|
|
|
# define DECLARE_HOOK(NAME, PROTO) \
|
|
typedef void __##NAME##_hook_function_t PROTO;\
|
|
symbol_set_declare (NAME)
|
|
|
|
/* Run all the functions hooked on the set called NAME.
|
|
Each function is called like this: `function ARGS'. */
|
|
|
|
# define RUN_HOOK(NAME, ARGS) \
|
|
do { \
|
|
void *const *ptr; \
|
|
for (ptr = (void *const *) symbol_set_first_element (NAME); \
|
|
! symbol_set_end_p (NAME, ptr); ++ptr) \
|
|
(*(__##NAME##_hook_function_t *) *ptr) ARGS; \
|
|
} while (0)
|
|
|
|
/* Define a hook variable with NAME and PROTO, and a function called RUNNER
|
|
which calls each function on the hook in turn, with ARGS. */
|
|
|
|
# define DEFINE_HOOK_RUNNER(name, runner, proto, args) \
|
|
DEFINE_HOOK (name, proto); \
|
|
extern void runner proto; void runner proto { RUN_HOOK (name, args); }
|
|
|
|
#else
|
|
|
|
/* The system does not provide necessary support for this. */
|
|
# define DEFINE_HOOK(NAME, PROTO)
|
|
|
|
# define DECLARE_HOOK(NAME, PROTO)
|
|
|
|
# define RUN_HOOK(NAME, ARGS)
|
|
|
|
# define DEFINE_HOOK_RUNNER(name, runner, proto, args)
|
|
|
|
#endif
|
|
|
|
#endif /* set-hooks.h */
|