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>
65 lines
2 KiB
C
65 lines
2 KiB
C
/* Copyright (C) 1997-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/>. */
|
|
|
|
#include <atomic.h>
|
|
#include <stdlib.h>
|
|
#include <set-hooks.h>
|
|
#include <libc-internal.h>
|
|
|
|
#include "../libio/libioP.h"
|
|
|
|
DEFINE_HOOK (__libc_subfreeres, (void));
|
|
|
|
symbol_set_define (__libc_freeres_ptrs);
|
|
|
|
extern __attribute__ ((weak)) void __libdl_freeres (void);
|
|
|
|
extern __attribute__ ((weak)) void __libpthread_freeres (void);
|
|
|
|
void __libc_freeres_fn_section
|
|
__libc_freeres (void)
|
|
{
|
|
/* This function might be called from different places. So better
|
|
protect for multiple executions since these are fatal. */
|
|
static long int already_called;
|
|
|
|
if (!atomic_compare_and_exchange_bool_acq (&already_called, 1, 0))
|
|
{
|
|
void *const *p;
|
|
|
|
_IO_cleanup ();
|
|
|
|
/* We run the resource freeing after IO cleanup. */
|
|
RUN_HOOK (__libc_subfreeres, ());
|
|
|
|
/* Call the libdl list of cleanup functions
|
|
(weak-ref-and-check). */
|
|
if (&__libdl_freeres != NULL)
|
|
__libdl_freeres ();
|
|
|
|
/* Call the libpthread list of cleanup functions
|
|
(weak-ref-and-check). */
|
|
if (&__libpthread_freeres != NULL)
|
|
__libpthread_freeres ();
|
|
|
|
for (p = symbol_set_first_element (__libc_freeres_ptrs);
|
|
!symbol_set_end_p (__libc_freeres_ptrs, p); ++p)
|
|
free (*p);
|
|
}
|
|
}
|
|
libc_hidden_def (__libc_freeres)
|