2016-08-26 20:40:27 +00:00
|
|
|
/* Minimal malloc implementation for interposition tests.
|
2020-01-01 00:14:33 +00:00
|
|
|
Copyright (C) 2016-2020 Free Software Foundation, Inc.
|
2016-08-26 20:40:27 +00:00
|
|
|
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; see the file COPYING.LIB. If
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
not, see <https://www.gnu.org/licenses/>. */
|
2016-08-26 20:40:27 +00:00
|
|
|
|
|
|
|
#include "tst-interpose-aux.h"
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stddef.h>
|
2017-02-16 22:31:42 +00:00
|
|
|
#include <stdint.h>
|
2016-08-26 20:40:27 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <sys/mman.h>
|
|
|
|
#include <sys/uio.h>
|
|
|
|
#include <unistd.h>
|
elf: Move vDSO setup to rtld (BZ#24967)
This patch moves the vDSO setup from libc to loader code, just after
the vDSO link_map setup. For static case the initialization
is moved to _dl_non_dynamic_init instead.
Instead of using the mangled pointer, the vDSO data is set as
attribute_relro (on _rtld_global_ro for shared or _dl_vdso_* for
static). It is read-only even with partial relro.
It fixes BZ#24967 now that the vDSO pointer is setup earlier than
malloc interposition is called.
Also, vDSO calls should not be a problem for static dlopen as
indicated by BZ#20802. The vDSO pointer would be zero-initialized
and the syscall will be issued instead.
Checked on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu,
arm-linux-gnueabihf, powerpc64le-linux-gnu, powerpc64-linux-gnu,
powerpc-linux-gnu, s390x-linux-gnu, sparc64-linux-gnu, and
sparcv9-linux-gnu. I also run some tests on mips.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
2019-11-29 13:44:59 +00:00
|
|
|
#include <time.h>
|
2016-08-26 20:40:27 +00:00
|
|
|
|
|
|
|
#if INTERPOSE_THREADS
|
|
|
|
#include <pthread.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Print the error message and terminate the process with status 1. */
|
|
|
|
__attribute__ ((noreturn))
|
|
|
|
__attribute__ ((format (printf, 1, 2)))
|
|
|
|
static void *
|
|
|
|
fail (const char *format, ...)
|
|
|
|
{
|
|
|
|
/* This assumes that vsnprintf will not call malloc. It does not do
|
|
|
|
so for the format strings we use. */
|
|
|
|
char message[4096];
|
|
|
|
va_list ap;
|
|
|
|
va_start (ap, format);
|
|
|
|
vsnprintf (message, sizeof (message), format, ap);
|
|
|
|
va_end (ap);
|
|
|
|
|
|
|
|
enum { count = 3 };
|
|
|
|
struct iovec iov[count];
|
|
|
|
|
|
|
|
iov[0].iov_base = (char *) "error: ";
|
|
|
|
iov[1].iov_base = (char *) message;
|
|
|
|
iov[2].iov_base = (char *) "\n";
|
|
|
|
|
|
|
|
for (int i = 0; i < count; ++i)
|
|
|
|
iov[i].iov_len = strlen (iov[i].iov_base);
|
|
|
|
|
|
|
|
int unused __attribute__ ((unused));
|
|
|
|
unused = writev (STDOUT_FILENO, iov, count);
|
|
|
|
_exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if INTERPOSE_THREADS
|
|
|
|
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void
|
|
|
|
lock (void)
|
|
|
|
{
|
|
|
|
#if INTERPOSE_THREADS
|
|
|
|
int ret = pthread_mutex_lock (&mutex);
|
|
|
|
if (ret != 0)
|
|
|
|
{
|
|
|
|
errno = ret;
|
|
|
|
fail ("pthread_mutex_lock: %m");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
unlock (void)
|
|
|
|
{
|
|
|
|
#if INTERPOSE_THREADS
|
|
|
|
int ret = pthread_mutex_unlock (&mutex);
|
|
|
|
if (ret != 0)
|
|
|
|
{
|
|
|
|
errno = ret;
|
|
|
|
fail ("pthread_mutex_unlock: %m");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
struct __attribute__ ((aligned (__alignof__ (max_align_t)))) allocation_header
|
|
|
|
{
|
|
|
|
size_t allocation_index;
|
|
|
|
size_t allocation_size;
|
elf: Move vDSO setup to rtld (BZ#24967)
This patch moves the vDSO setup from libc to loader code, just after
the vDSO link_map setup. For static case the initialization
is moved to _dl_non_dynamic_init instead.
Instead of using the mangled pointer, the vDSO data is set as
attribute_relro (on _rtld_global_ro for shared or _dl_vdso_* for
static). It is read-only even with partial relro.
It fixes BZ#24967 now that the vDSO pointer is setup earlier than
malloc interposition is called.
Also, vDSO calls should not be a problem for static dlopen as
indicated by BZ#20802. The vDSO pointer would be zero-initialized
and the syscall will be issued instead.
Checked on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu,
arm-linux-gnueabihf, powerpc64le-linux-gnu, powerpc64-linux-gnu,
powerpc-linux-gnu, s390x-linux-gnu, sparc64-linux-gnu, and
sparcv9-linux-gnu. I also run some tests on mips.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
2019-11-29 13:44:59 +00:00
|
|
|
struct timespec ts;
|
2016-08-26 20:40:27 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Array of known allocations, to track invalid frees. */
|
|
|
|
enum { max_allocations = 65536 };
|
|
|
|
static struct allocation_header *allocations[max_allocations];
|
|
|
|
static size_t allocation_index;
|
|
|
|
static size_t deallocation_count;
|
|
|
|
|
|
|
|
/* Sanity check for successful malloc interposition. */
|
|
|
|
__attribute__ ((destructor))
|
|
|
|
static void
|
|
|
|
check_for_allocations (void)
|
|
|
|
{
|
|
|
|
if (allocation_index == 0)
|
|
|
|
{
|
|
|
|
/* Make sure that malloc is called at least once from libc. */
|
|
|
|
void *volatile ptr = strdup ("ptr");
|
|
|
|
/* Compiler barrier. The strdup function calls malloc, which
|
|
|
|
updates allocation_index, but strdup is marked __THROW, so
|
|
|
|
the compiler could optimize away the reload. */
|
|
|
|
__asm__ volatile ("" ::: "memory");
|
2017-03-21 15:41:56 +00:00
|
|
|
free (ptr);
|
2016-08-26 20:40:27 +00:00
|
|
|
/* If the allocation count is still zero, it means we did not
|
|
|
|
interpose malloc successfully. */
|
|
|
|
if (allocation_index == 0)
|
|
|
|
fail ("malloc does not seem to have been interposed");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct allocation_header *get_header (const char *op, void *ptr)
|
|
|
|
{
|
|
|
|
struct allocation_header *header = ((struct allocation_header *) ptr) - 1;
|
|
|
|
if (header->allocation_index >= allocation_index)
|
|
|
|
fail ("%s: %p: invalid allocation index: %zu (not less than %zu)",
|
|
|
|
op, ptr, header->allocation_index, allocation_index);
|
|
|
|
if (allocations[header->allocation_index] != header)
|
|
|
|
fail ("%s: %p: allocation pointer does not point to header, but %p",
|
|
|
|
op, ptr, allocations[header->allocation_index]);
|
|
|
|
return header;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Internal helper functions. Those must be called while the lock is
|
|
|
|
acquired. */
|
|
|
|
|
|
|
|
static void *
|
|
|
|
malloc_internal (size_t size)
|
|
|
|
{
|
|
|
|
if (allocation_index == max_allocations)
|
|
|
|
{
|
|
|
|
errno = ENOMEM;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
size_t allocation_size = size + sizeof (struct allocation_header);
|
|
|
|
if (allocation_size < size)
|
|
|
|
{
|
|
|
|
errno = ENOMEM;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t index = allocation_index++;
|
|
|
|
void *result = mmap (NULL, allocation_size, PROT_READ | PROT_WRITE,
|
|
|
|
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
|
|
|
if (result == MAP_FAILED)
|
|
|
|
return NULL;
|
|
|
|
allocations[index] = result;
|
|
|
|
*allocations[index] = (struct allocation_header)
|
|
|
|
{
|
|
|
|
.allocation_index = index,
|
|
|
|
.allocation_size = allocation_size
|
|
|
|
};
|
elf: Move vDSO setup to rtld (BZ#24967)
This patch moves the vDSO setup from libc to loader code, just after
the vDSO link_map setup. For static case the initialization
is moved to _dl_non_dynamic_init instead.
Instead of using the mangled pointer, the vDSO data is set as
attribute_relro (on _rtld_global_ro for shared or _dl_vdso_* for
static). It is read-only even with partial relro.
It fixes BZ#24967 now that the vDSO pointer is setup earlier than
malloc interposition is called.
Also, vDSO calls should not be a problem for static dlopen as
indicated by BZ#20802. The vDSO pointer would be zero-initialized
and the syscall will be issued instead.
Checked on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu,
arm-linux-gnueabihf, powerpc64le-linux-gnu, powerpc64-linux-gnu,
powerpc-linux-gnu, s390x-linux-gnu, sparc64-linux-gnu, and
sparcv9-linux-gnu. I also run some tests on mips.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
2019-11-29 13:44:59 +00:00
|
|
|
/* BZ#24967: Check if calling a symbol which may use the vDSO does not fail.
|
|
|
|
The CLOCK_REALTIME should be supported on all systems. */
|
|
|
|
clock_gettime (CLOCK_REALTIME, &allocations[index]->ts);
|
2016-08-26 20:40:27 +00:00
|
|
|
return allocations[index] + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
free_internal (const char *op, struct allocation_header *header)
|
|
|
|
{
|
|
|
|
size_t index = header->allocation_index;
|
|
|
|
int result = mprotect (header, header->allocation_size, PROT_NONE);
|
|
|
|
if (result != 0)
|
|
|
|
fail ("%s: mprotect (%p, %zu): %m", op, header, header->allocation_size);
|
|
|
|
/* Catch double-free issues. */
|
|
|
|
allocations[index] = NULL;
|
|
|
|
++deallocation_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *
|
|
|
|
realloc_internal (void *ptr, size_t new_size)
|
|
|
|
{
|
|
|
|
struct allocation_header *header = get_header ("realloc", ptr);
|
|
|
|
size_t old_size = header->allocation_size - sizeof (struct allocation_header);
|
|
|
|
if (old_size >= new_size)
|
|
|
|
return ptr;
|
|
|
|
|
|
|
|
void *newptr = malloc_internal (new_size);
|
|
|
|
if (newptr == NULL)
|
|
|
|
return NULL;
|
|
|
|
memcpy (newptr, ptr, old_size);
|
|
|
|
free_internal ("realloc", header);
|
|
|
|
return newptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Public interfaces. These functions must perform locking. */
|
|
|
|
|
|
|
|
size_t
|
|
|
|
malloc_allocation_count (void)
|
|
|
|
{
|
|
|
|
lock ();
|
|
|
|
size_t count = allocation_index;
|
|
|
|
unlock ();
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t
|
|
|
|
malloc_deallocation_count (void)
|
|
|
|
{
|
|
|
|
lock ();
|
|
|
|
size_t count = deallocation_count;
|
|
|
|
unlock ();
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
void *
|
|
|
|
malloc (size_t size)
|
|
|
|
{
|
|
|
|
lock ();
|
|
|
|
void *result = malloc_internal (size);
|
|
|
|
unlock ();
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
free (void *ptr)
|
|
|
|
{
|
|
|
|
if (ptr == NULL)
|
|
|
|
return;
|
|
|
|
lock ();
|
|
|
|
struct allocation_header *header = get_header ("free", ptr);
|
|
|
|
free_internal ("free", header);
|
|
|
|
unlock ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
calloc (size_t a, size_t b)
|
|
|
|
{
|
|
|
|
if (b > 0 && a > SIZE_MAX / b)
|
|
|
|
{
|
|
|
|
errno = ENOMEM;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
lock ();
|
|
|
|
/* malloc_internal uses mmap, so the memory is zeroed. */
|
|
|
|
void *result = malloc_internal (a * b);
|
|
|
|
unlock ();
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
realloc (void *ptr, size_t n)
|
|
|
|
{
|
|
|
|
if (n ==0)
|
|
|
|
{
|
|
|
|
free (ptr);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
else if (ptr == NULL)
|
|
|
|
return malloc (n);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
lock ();
|
|
|
|
void *result = realloc_internal (ptr, n);
|
|
|
|
unlock ();
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|