diff options
| author | Carlos O'Donell <carlos@redhat.com> | 2018-06-22 09:28:47 -0400 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2018-06-29 22:39:06 -0400 |
| commit | 2827ab990aefbb0e53374199b875d98f116d6390 (patch) | |
| tree | 0063b4c07be87d887d4a4893b9681b9e61479e8b /resolv | |
| parent | 37d3d244e1a0ca7e7ac89b8e768e665adbb2e2d8 (diff) | |
| download | glibc-2827ab990aefbb0e53374199b875d98f116d6390.tar glibc-2827ab990aefbb0e53374199b875d98f116d6390.tar.gz glibc-2827ab990aefbb0e53374199b875d98f116d6390.tar.bz2 glibc-2827ab990aefbb0e53374199b875d98f116d6390.zip | |
libc: Extend __libc_freeres framework (Bug 23329).
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>
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/res-close.c | 1 | ||||
| -rw-r--r-- | resolv/resolv_conf.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/resolv/res-close.c b/resolv/res-close.c index 38572b1d2f..1c36dd5f1d 100644 --- a/resolv/res-close.c +++ b/resolv/res-close.c @@ -140,4 +140,5 @@ __res_thread_freeres (void) /* Make sure we do a full re-initialization the next time. */ _res.options = 0; } +/* Also must be called when the main thread exits. */ text_set_element (__libc_subfreeres, __res_thread_freeres); diff --git a/resolv/resolv_conf.c b/resolv/resolv_conf.c index b4021ab735..2f0ffbc524 100644 --- a/resolv/resolv_conf.c +++ b/resolv/resolv_conf.c @@ -23,6 +23,7 @@ #include <libc-lock.h> #include <resolv-internal.h> #include <sys/stat.h> +#include <libc-symbols.h> /* _res._u._ext.__glibc_extension_index is used as an index into a struct resolv_conf_array object. The intent of this construction |