mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +00:00
f17a42333f
sys/cdefs.h has a macro __ptr_t, which a few places in glibc use instead of void *. void * is a well-understood standard type for that purpose and in a post-C89 context there is no need for a macro for it; this patch changes those places to use void * directly instead. Unlike __long_double_t, __ptr_t is widely used outside glibc (or at least has many hits on codesearch.debian.net). I don't know how many of those uses would break if sys/cdefs.h ceased to define the macro, but there's enough risk that this patch leaves the definition and just removes the uses within glibc; removal of the definition can be considered separately if desired. Tested for x86_64, and with build-many-glibcs.py. * malloc/mcheck.c (old_free_hook): Use void * instead of __ptr_t. (old_malloc_hook): Likewise. (old_memalign_hook): Likewise. (old_realloc_hook): Likewise. (struct hdr): Likewise. (flood): Likewise. (freehook): Likewise. (mallochook): Likewise. (memalignhook): Likewise. (reallochook): Likewise. (mprobe): Likewise. * malloc/mtrace.c (mallwatch): Likewise. (tr_old_free_hook): Likewise. (tr_old_malloc_hook): Likewise. (tr_old_realloc_hook): Likewise. (tr_old_memalign_hook): Likewise. (tr_where): Likewise. (lock_and_info): Likewise. (tr_freehook): Likewise. (tr_mallochook): Likewise. (tr_reallochook): Likewise. (tr_memalignhook): Likewise. * misc/err.h [!__GNUC_VA_LIST] (__gnuc_va_list): Likewise. * misc/mmap.c (__mmap): Likewise. * misc/mmap64.c (__mmap64): Likewise. * misc/mprotect.c (__mprotect): Likewise. * misc/msync.c (msync): Likewise. * misc/munmap.c (__munmap): Likewise. * posix/posix_madvise.c (posix_madvise): Likewise. * socket/send.c (__send): Likewise. * socket/sendto.c (__sendto): Likewise. * socket/setsockopt.c (__setsockopt): Likewise. * string/memcmp.c (__ptr_t): Remove macro. (MEMCMP): Use void * instead of ptr_t. * string/memrchr.c (__ptr_t): Remove macro. (__memrchr): Use void * instead of ptr_t. * sysdeps/mach/hurd/dl-sysdep.c (__mmap): Likewise. * sysdeps/mach/hurd/mmap.c (__mmap): Likewise. * sysdeps/mach/hurd/mmap64.c (__mmap64): Likewise. * sysdeps/mach/mprotect.c (__mprotect): Likewise. * sysdeps/mach/msync.c (msync): Likewise. * sysdeps/mach/munmap.c (__munmap): Likewise. * sysdeps/mips/bits/setjmp.h (struct __jmp_buf_internal_tag): Likewise. * sysdeps/posix/getcwd.c (__getcwd): Likewise. * sysdeps/powerpc/powerpc32/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc32/power4/memcpy.S (memcpy): Likewise. * sysdeps/powerpc/powerpc32/power4/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc32/power6/memcpy.S (memcpy): Likewise. * sysdeps/powerpc/powerpc32/power6/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc32/power7/memcpy.S (memcpy): Likewise. * sysdeps/powerpc/powerpc32/power7/mempcpy.S (__mempcpy): Likewise. * sysdeps/powerpc/powerpc32/power7/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc64/memcpy.S (memcpy): Likewise. * sysdeps/powerpc/powerpc64/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc64/power4/memcpy.S (memcpy): Likewise. * sysdeps/powerpc/powerpc64/power4/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc64/power6/memcpy.S (memcpy): Likewise. * sysdeps/powerpc/powerpc64/power6/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc64/power7/memcpy.S (memcpy): Likewise. * sysdeps/powerpc/powerpc64/power7/mempcpy.S (__mempcpy): Likewise. * sysdeps/powerpc/powerpc64/power7/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc64/power8/memset.S (memset): Likewise. * sysdeps/tile/memcmp.c (__ptr_t): Remove macro. (MEMCMP): Use void * instead of ptr_t. * sysdeps/unix/sysv/linux/alpha/oldglob.c (old_glob_t): Likewise. * sysdeps/unix/sysv/linux/mmap.c (__mmap): Likewise.
349 lines
9.3 KiB
C
349 lines
9.3 KiB
C
/* More debugging hooks for `malloc'.
|
|
Copyright (C) 1991-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written April 2, 1991 by John Gilmore of Cygnus Support.
|
|
Based on mcheck.c by Mike Haertel.
|
|
|
|
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 _MALLOC_INTERNAL
|
|
# define _MALLOC_INTERNAL
|
|
# include <malloc.h>
|
|
# include <mcheck.h>
|
|
# include <libc-lock.h>
|
|
#endif
|
|
|
|
#include <dlfcn.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <_itoa.h>
|
|
|
|
#include <libc-internal.h>
|
|
|
|
#include <libio/iolibio.h>
|
|
#define setvbuf(s, b, f, l) _IO_setvbuf (s, b, f, l)
|
|
#define fwrite(buf, size, count, fp) _IO_fwrite (buf, size, count, fp)
|
|
|
|
#include <kernel-features.h>
|
|
|
|
#define TRACE_BUFFER_SIZE 512
|
|
|
|
static FILE *mallstream;
|
|
static const char mallenv[] = "MALLOC_TRACE";
|
|
static char *malloc_trace_buffer;
|
|
|
|
__libc_lock_define_initialized (static, lock);
|
|
|
|
/* Address to breakpoint on accesses to... */
|
|
void *mallwatch;
|
|
|
|
/* Old hook values. */
|
|
static void (*tr_old_free_hook) (void *ptr, const void *);
|
|
static void *(*tr_old_malloc_hook) (size_t size, const void *);
|
|
static void *(*tr_old_realloc_hook) (void *ptr, size_t size,
|
|
const void *);
|
|
static void *(*tr_old_memalign_hook) (size_t __alignment, size_t __size,
|
|
const void *);
|
|
|
|
/* This function is called when the block being alloc'd, realloc'd, or
|
|
freed has an address matching the variable "mallwatch". In a debugger,
|
|
set "mallwatch" to the address of interest, then put a breakpoint on
|
|
tr_break. */
|
|
|
|
extern void tr_break (void) __THROW;
|
|
libc_hidden_proto (tr_break)
|
|
void
|
|
tr_break (void)
|
|
{
|
|
}
|
|
libc_hidden_def (tr_break)
|
|
|
|
static void internal_function
|
|
tr_where (const void *caller, Dl_info *info)
|
|
{
|
|
if (caller != NULL)
|
|
{
|
|
if (info != NULL)
|
|
{
|
|
char *buf = (char *) "";
|
|
if (info->dli_sname != NULL)
|
|
{
|
|
size_t len = strlen (info->dli_sname);
|
|
buf = alloca (len + 6 + 2 * sizeof (void *));
|
|
|
|
buf[0] = '(';
|
|
__stpcpy (_fitoa (caller >= (const void *) info->dli_saddr
|
|
? caller - (const void *) info->dli_saddr
|
|
: (const void *) info->dli_saddr - caller,
|
|
__stpcpy (__mempcpy (buf + 1, info->dli_sname,
|
|
len),
|
|
caller >= (void *) info->dli_saddr
|
|
? "+0x" : "-0x"),
|
|
16, 0),
|
|
")");
|
|
}
|
|
|
|
fprintf (mallstream, "@ %s%s%s[%p] ",
|
|
info->dli_fname ? : "", info->dli_fname ? ":" : "",
|
|
buf, caller);
|
|
}
|
|
else
|
|
fprintf (mallstream, "@ [%p] ", caller);
|
|
}
|
|
}
|
|
|
|
static Dl_info *
|
|
lock_and_info (const void *caller, Dl_info *mem)
|
|
{
|
|
if (caller == NULL)
|
|
return NULL;
|
|
|
|
Dl_info *res = _dl_addr (caller, mem, NULL, NULL) ? mem : NULL;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
return res;
|
|
}
|
|
|
|
static void
|
|
tr_freehook (void *ptr, const void *caller)
|
|
{
|
|
if (ptr == NULL)
|
|
return;
|
|
|
|
Dl_info mem;
|
|
Dl_info *info = lock_and_info (caller, &mem);
|
|
tr_where (caller, info);
|
|
/* Be sure to print it first. */
|
|
fprintf (mallstream, "- %p\n", ptr);
|
|
if (ptr == mallwatch)
|
|
{
|
|
__libc_lock_unlock (lock);
|
|
tr_break ();
|
|
__libc_lock_lock (lock);
|
|
}
|
|
__free_hook = tr_old_free_hook;
|
|
if (tr_old_free_hook != NULL)
|
|
(*tr_old_free_hook)(ptr, caller);
|
|
else
|
|
free (ptr);
|
|
__free_hook = tr_freehook;
|
|
__libc_lock_unlock (lock);
|
|
}
|
|
|
|
static void *
|
|
tr_mallochook (size_t size, const void *caller)
|
|
{
|
|
void *hdr;
|
|
|
|
Dl_info mem;
|
|
Dl_info *info = lock_and_info (caller, &mem);
|
|
|
|
__malloc_hook = tr_old_malloc_hook;
|
|
if (tr_old_malloc_hook != NULL)
|
|
hdr = (void *) (*tr_old_malloc_hook)(size, caller);
|
|
else
|
|
hdr = (void *) malloc (size);
|
|
__malloc_hook = tr_mallochook;
|
|
|
|
tr_where (caller, info);
|
|
/* We could be printing a NULL here; that's OK. */
|
|
fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long int) size);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
if (hdr == mallwatch)
|
|
tr_break ();
|
|
|
|
return hdr;
|
|
}
|
|
|
|
static void *
|
|
tr_reallochook (void *ptr, size_t size, const void *caller)
|
|
{
|
|
void *hdr;
|
|
|
|
if (ptr == mallwatch)
|
|
tr_break ();
|
|
|
|
Dl_info mem;
|
|
Dl_info *info = lock_and_info (caller, &mem);
|
|
|
|
__free_hook = tr_old_free_hook;
|
|
__malloc_hook = tr_old_malloc_hook;
|
|
__realloc_hook = tr_old_realloc_hook;
|
|
if (tr_old_realloc_hook != NULL)
|
|
hdr = (void *) (*tr_old_realloc_hook)(ptr, size, caller);
|
|
else
|
|
hdr = (void *) realloc (ptr, size);
|
|
__free_hook = tr_freehook;
|
|
__malloc_hook = tr_mallochook;
|
|
__realloc_hook = tr_reallochook;
|
|
|
|
tr_where (caller, info);
|
|
if (hdr == NULL)
|
|
{
|
|
if (size != 0)
|
|
/* Failed realloc. */
|
|
fprintf (mallstream, "! %p %#lx\n", ptr, (unsigned long int) size);
|
|
else
|
|
fprintf (mallstream, "- %p\n", ptr);
|
|
}
|
|
else if (ptr == NULL)
|
|
fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long int) size);
|
|
else
|
|
{
|
|
fprintf (mallstream, "< %p\n", ptr);
|
|
tr_where (caller, info);
|
|
fprintf (mallstream, "> %p %#lx\n", hdr, (unsigned long int) size);
|
|
}
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
if (hdr == mallwatch)
|
|
tr_break ();
|
|
|
|
return hdr;
|
|
}
|
|
|
|
static void *
|
|
tr_memalignhook (size_t alignment, size_t size, const void *caller)
|
|
{
|
|
void *hdr;
|
|
|
|
Dl_info mem;
|
|
Dl_info *info = lock_and_info (caller, &mem);
|
|
|
|
__memalign_hook = tr_old_memalign_hook;
|
|
__malloc_hook = tr_old_malloc_hook;
|
|
if (tr_old_memalign_hook != NULL)
|
|
hdr = (void *) (*tr_old_memalign_hook)(alignment, size, caller);
|
|
else
|
|
hdr = (void *) memalign (alignment, size);
|
|
__memalign_hook = tr_memalignhook;
|
|
__malloc_hook = tr_mallochook;
|
|
|
|
tr_where (caller, info);
|
|
/* We could be printing a NULL here; that's OK. */
|
|
fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long int) size);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
if (hdr == mallwatch)
|
|
tr_break ();
|
|
|
|
return hdr;
|
|
}
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
/* This function gets called to make sure all memory the library
|
|
allocates get freed and so does not irritate the user when studying
|
|
the mtrace output. */
|
|
static void __libc_freeres_fn_section
|
|
release_libc_mem (void)
|
|
{
|
|
/* Only call the free function if we still are running in mtrace mode. */
|
|
if (mallstream != NULL)
|
|
__libc_freeres ();
|
|
}
|
|
#endif
|
|
|
|
|
|
/* We enable tracing if either the environment variable MALLOC_TRACE
|
|
is set, or if the variable mallwatch has been patched to an address
|
|
that the debugging user wants us to stop on. When patching mallwatch,
|
|
don't forget to set a breakpoint on tr_break! */
|
|
|
|
void
|
|
mtrace (void)
|
|
{
|
|
#ifdef _LIBC
|
|
static int added_atexit_handler;
|
|
#endif
|
|
char *mallfile;
|
|
|
|
/* Don't panic if we're called more than once. */
|
|
if (mallstream != NULL)
|
|
return;
|
|
|
|
#ifdef _LIBC
|
|
/* When compiling the GNU libc we use the secure getenv function
|
|
which prevents the misuse in case of SUID or SGID enabled
|
|
programs. */
|
|
mallfile = __libc_secure_getenv (mallenv);
|
|
#else
|
|
mallfile = getenv (mallenv);
|
|
#endif
|
|
if (mallfile != NULL || mallwatch != NULL)
|
|
{
|
|
char *mtb = malloc (TRACE_BUFFER_SIZE);
|
|
if (mtb == NULL)
|
|
return;
|
|
|
|
mallstream = fopen (mallfile != NULL ? mallfile : "/dev/null", "wce");
|
|
if (mallstream != NULL)
|
|
{
|
|
/* Be sure it doesn't malloc its buffer! */
|
|
malloc_trace_buffer = mtb;
|
|
setvbuf (mallstream, malloc_trace_buffer, _IOFBF, TRACE_BUFFER_SIZE);
|
|
fprintf (mallstream, "= Start\n");
|
|
tr_old_free_hook = __free_hook;
|
|
__free_hook = tr_freehook;
|
|
tr_old_malloc_hook = __malloc_hook;
|
|
__malloc_hook = tr_mallochook;
|
|
tr_old_realloc_hook = __realloc_hook;
|
|
__realloc_hook = tr_reallochook;
|
|
tr_old_memalign_hook = __memalign_hook;
|
|
__memalign_hook = tr_memalignhook;
|
|
#ifdef _LIBC
|
|
if (!added_atexit_handler)
|
|
{
|
|
extern void *__dso_handle __attribute__ ((__weak__));
|
|
added_atexit_handler = 1;
|
|
__cxa_atexit ((void (*)(void *))release_libc_mem, NULL,
|
|
&__dso_handle ? __dso_handle : NULL);
|
|
}
|
|
#endif
|
|
}
|
|
else
|
|
free (mtb);
|
|
}
|
|
}
|
|
|
|
void
|
|
muntrace (void)
|
|
{
|
|
if (mallstream == NULL)
|
|
return;
|
|
|
|
/* Do the reverse of what done in mtrace: first reset the hooks and
|
|
MALLSTREAM, and only after that write the trailer and close the
|
|
file. */
|
|
FILE *f = mallstream;
|
|
mallstream = NULL;
|
|
__free_hook = tr_old_free_hook;
|
|
__malloc_hook = tr_old_malloc_hook;
|
|
__realloc_hook = tr_old_realloc_hook;
|
|
__memalign_hook = tr_old_memalign_hook;
|
|
|
|
fprintf (f, "= End\n");
|
|
fclose (f);
|
|
}
|