2005-03-20 18:09:53 +00:00
|
|
|
/* Malloc implementation for multiple threads without lock contention.
|
2021-01-02 19:32:25 +00:00
|
|
|
Copyright (C) 1996-2021 Free Software Foundation, Inc.
|
1996-12-08 08:01:13 +00:00
|
|
|
This file is part of the GNU C Library.
|
2002-01-29 07:54:51 +00:00
|
|
|
Contributed by Wolfram Gloger <wg@malloc.de>
|
|
|
|
and Doug Lea <dl@cs.oswego.edu>, 2001.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2002-08-26 22:40:48 +00:00
|
|
|
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
|
2002-01-29 07:54:51 +00:00
|
|
|
License, or (at your option) any later version.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
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
|
2002-08-26 22:40:48 +00:00
|
|
|
Lesser General Public License for more details.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-08-26 22:40:48 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
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/>. */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
This is a version (aka ptmalloc2) of malloc/free/realloc written by
|
|
|
|
Doug Lea and adapted to multiple threads/arenas by Wolfram Gloger.
|
|
|
|
|
2014-08-12 09:23:41 +00:00
|
|
|
There have been substantial changes made after the integration into
|
2009-04-18 05:14:52 +00:00
|
|
|
glibc in all parts of the code. Do not look for much commonality
|
|
|
|
with the ptmalloc2 version.
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
* Version ptmalloc2-20011215
|
|
|
|
based on:
|
|
|
|
VERSION 2.7.0 Sun Mar 11 14:14:06 2001 Doug Lea (dl at gee)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
* Quickstart
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
In order to compile this implementation, a Makefile is provided with
|
|
|
|
the ptmalloc2 distribution, which has pre-defined targets for some
|
|
|
|
popular systems (e.g. "make posix" for Posix threads). All that is
|
|
|
|
typically required with regard to compiler flags is the selection of
|
|
|
|
the thread package via defining one out of USE_PTHREADS, USE_THR or
|
|
|
|
USE_SPROC. Check the thread-m.h file for what effects this has.
|
|
|
|
Many/most systems will additionally require USE_TSD_DATA_HACK to be
|
|
|
|
defined, so this is the default for "make posix".
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
* Why use this malloc?
|
|
|
|
|
|
|
|
This is not the fastest, most space-conserving, most portable, or
|
|
|
|
most tunable malloc ever written. However it is among the fastest
|
|
|
|
while also being among the most space-conserving, portable and tunable.
|
|
|
|
Consistent balance across these factors results in a good general-purpose
|
2002-01-29 07:54:51 +00:00
|
|
|
allocator for malloc-intensive programs.
|
|
|
|
|
|
|
|
The main properties of the algorithms are:
|
|
|
|
* For large (>= 512 bytes) requests, it is a pure best-fit allocator,
|
|
|
|
with ties normally decided via FIFO (i.e. least recently used).
|
|
|
|
* For small (<= 64 bytes by default) requests, it is a caching
|
|
|
|
allocator, that maintains pools of quickly recycled chunks.
|
|
|
|
* In between, and for combinations of large and small requests, it does
|
|
|
|
the best it can trying to meet both goals at once.
|
|
|
|
* For very large requests (>= 128KB by default), it relies on system
|
|
|
|
memory mapping facilities, if supported.
|
|
|
|
|
|
|
|
For a longer but slightly out of date high-level description, see
|
|
|
|
http://gee.cs.oswego.edu/dl/html/malloc.html
|
|
|
|
|
|
|
|
You may already by default be using a C library containing a malloc
|
|
|
|
that is based on some version of this malloc (for example in
|
|
|
|
linux). You might still want to use the one in this file in order to
|
|
|
|
customize settings or to avoid overheads associated with library
|
|
|
|
versions.
|
|
|
|
|
|
|
|
* Contents, described in more detail in "description of public routines" below.
|
|
|
|
|
|
|
|
Standard (ANSI/SVID/...) functions:
|
|
|
|
malloc(size_t n);
|
|
|
|
calloc(size_t n_elements, size_t element_size);
|
2011-09-10 22:10:17 +00:00
|
|
|
free(void* p);
|
|
|
|
realloc(void* p, size_t n);
|
2002-01-29 07:54:51 +00:00
|
|
|
memalign(size_t alignment, size_t n);
|
|
|
|
valloc(size_t n);
|
|
|
|
mallinfo()
|
|
|
|
mallopt(int parameter_number, int parameter_value)
|
|
|
|
|
|
|
|
Additional functions:
|
2011-09-10 22:10:17 +00:00
|
|
|
independent_calloc(size_t n_elements, size_t size, void* chunks[]);
|
|
|
|
independent_comalloc(size_t n_elements, size_t sizes[], void* chunks[]);
|
2002-01-29 07:54:51 +00:00
|
|
|
pvalloc(size_t n);
|
|
|
|
malloc_trim(size_t pad);
|
2011-09-10 22:10:17 +00:00
|
|
|
malloc_usable_size(void* p);
|
2002-01-29 07:54:51 +00:00
|
|
|
malloc_stats();
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
* Vital statistics:
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
Supported pointer representation: 4 or 8 bytes
|
2002-02-07 05:30:48 +00:00
|
|
|
Supported size_t representation: 4 or 8 bytes
|
1996-12-08 08:01:13 +00:00
|
|
|
Note that size_t is allowed to be 4 bytes even if pointers are 8.
|
2002-01-29 07:54:51 +00:00
|
|
|
You can adjust this by defining INTERNAL_SIZE_T
|
|
|
|
|
|
|
|
Alignment: 2 * sizeof(size_t) (default)
|
|
|
|
(i.e., 8 byte alignment with 4byte size_t). This suffices for
|
|
|
|
nearly all current machines and C compilers. However, you can
|
|
|
|
define MALLOC_ALIGNMENT to be wider than this if necessary.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
Minimum overhead per allocated chunk: 4 or 8 bytes
|
|
|
|
Each malloced chunk has a hidden word of overhead holding size
|
1996-12-08 08:01:13 +00:00
|
|
|
and status information.
|
|
|
|
|
|
|
|
Minimum allocated size: 4-byte ptrs: 16 bytes (including 4 overhead)
|
2009-08-31 11:55:10 +00:00
|
|
|
8-byte ptrs: 24/32 bytes (including, 4/8 overhead)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
When a chunk is freed, 12 (for 4byte ptrs) or 20 (for 8 byte
|
|
|
|
ptrs but 4 byte size) or 24 (for 8/8) additional bytes are
|
2002-01-29 07:54:51 +00:00
|
|
|
needed; 4 (8) for a trailing size field and 8 (16) bytes for
|
|
|
|
free list pointers. Thus, the minimum allocatable size is
|
|
|
|
16/24/32 bytes.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
Even a request for zero bytes (i.e., malloc(0)) returns a
|
|
|
|
pointer to something of the minimum allocatable size.
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
The maximum overhead wastage (i.e., number of extra bytes
|
|
|
|
allocated than were requested in malloc) is less than or equal
|
|
|
|
to the minimum size, except for requests >= mmap_threshold that
|
|
|
|
are serviced via mmap(), where the worst case wastage is 2 *
|
|
|
|
sizeof(size_t) bytes plus the remainder from a system page (the
|
|
|
|
minimal mmap unit); typically 4096 or 8192 bytes.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
Maximum allocated size: 4-byte size_t: 2^32 minus about two pages
|
2009-08-31 11:55:10 +00:00
|
|
|
8-byte size_t: 2^64 minus about two pages
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
It is assumed that (possibly signed) size_t values suffice to
|
1996-12-08 08:01:13 +00:00
|
|
|
represent chunk sizes. `Possibly signed' is due to the fact
|
|
|
|
that `size_t' may be defined on a system as either a signed or
|
2002-01-29 07:54:51 +00:00
|
|
|
an unsigned type. The ISO C standard says that it must be
|
|
|
|
unsigned, but a few systems are known not to adhere to this.
|
|
|
|
Additionally, even when size_t is unsigned, sbrk (which is by
|
|
|
|
default used to obtain memory from system) accepts signed
|
|
|
|
arguments, and may not be able to handle size_t-wide arguments
|
|
|
|
with negative sign bit. Generally, values that would
|
|
|
|
appear as negative after accounting for overhead and alignment
|
|
|
|
are supported only via mmap(), which does not have this
|
|
|
|
limitation.
|
|
|
|
|
|
|
|
Requests for sizes outside the allowed range will perform an optional
|
|
|
|
failure action and then return null. (Requests may also
|
|
|
|
also fail because a system is out of memory.)
|
|
|
|
|
2011-09-10 22:10:17 +00:00
|
|
|
Thread-safety: thread-safe
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
Compliance: I believe it is compliant with the 1997 Single Unix Specification
|
2010-03-26 12:09:55 +00:00
|
|
|
Also SVID/XPG, ANSI C, and probably others as well.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
* Synopsis of compile-time options:
|
|
|
|
|
|
|
|
People have reported using previous versions of this malloc on all
|
|
|
|
versions of Unix, sometimes by tweaking some of the defines
|
2011-09-10 22:10:17 +00:00
|
|
|
below. It has been tested most extensively on Solaris and Linux.
|
2002-01-29 07:54:51 +00:00
|
|
|
People also report using it in stand-alone embedded systems.
|
|
|
|
|
|
|
|
The implementation is in straight, hand-tuned ANSI C. It is not
|
|
|
|
at all modular. (Sorry!) It uses a lot of macros. To be at all
|
|
|
|
usable, this code should be compiled using an optimizing compiler
|
|
|
|
(for example gcc -O3) that can simplify expressions and control
|
|
|
|
paths. (FAQ: some macros import variables as arguments rather than
|
|
|
|
declare locals because people reported that some debuggers
|
|
|
|
otherwise get confused.)
|
|
|
|
|
|
|
|
OPTION DEFAULT VALUE
|
|
|
|
|
|
|
|
Compilation Environment options:
|
|
|
|
|
2013-01-17 20:08:12 +00:00
|
|
|
HAVE_MREMAP 0
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
Changing default word sizes:
|
|
|
|
|
|
|
|
INTERNAL_SIZE_T size_t
|
|
|
|
|
|
|
|
Configuration and functionality options:
|
|
|
|
|
|
|
|
USE_PUBLIC_MALLOC_WRAPPERS NOT defined
|
|
|
|
USE_MALLOC_LOCK NOT defined
|
|
|
|
MALLOC_DEBUG NOT defined
|
|
|
|
REALLOC_ZERO_BYTES_FREES 1
|
|
|
|
TRIM_FASTBINS 0
|
|
|
|
|
|
|
|
Options for customizing MORECORE:
|
|
|
|
|
|
|
|
MORECORE sbrk
|
|
|
|
MORECORE_FAILURE -1
|
2002-02-07 05:30:48 +00:00
|
|
|
MORECORE_CONTIGUOUS 1
|
2002-01-29 07:54:51 +00:00
|
|
|
MORECORE_CANNOT_TRIM NOT defined
|
|
|
|
MORECORE_CLEARS 1
|
2002-02-07 05:30:48 +00:00
|
|
|
MMAP_AS_MORECORE_SIZE (1024 * 1024)
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
Tuning options that are also dynamically changeable via mallopt:
|
|
|
|
|
2009-03-13 23:53:18 +00:00
|
|
|
DEFAULT_MXFAST 64 (for 32bit), 128 (for 64bit)
|
2002-01-29 07:54:51 +00:00
|
|
|
DEFAULT_TRIM_THRESHOLD 128 * 1024
|
|
|
|
DEFAULT_TOP_PAD 0
|
|
|
|
DEFAULT_MMAP_THRESHOLD 128 * 1024
|
|
|
|
DEFAULT_MMAP_MAX 65536
|
|
|
|
|
|
|
|
There are several other #defined constants and macros that you
|
|
|
|
probably don't want to touch unless you are extending or adapting malloc. */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
2011-09-10 22:10:17 +00:00
|
|
|
void* is the pointer type that malloc should say it returns
|
1996-12-08 08:01:13 +00:00
|
|
|
*/
|
|
|
|
|
2011-09-10 22:10:17 +00:00
|
|
|
#ifndef void
|
|
|
|
#define void void
|
|
|
|
#endif /*void*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#include <stddef.h> /* for size_t */
|
|
|
|
#include <stdlib.h> /* for getenv(), abort() */
|
2013-01-17 20:08:12 +00:00
|
|
|
#include <unistd.h> /* for __libc_enable_secure */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2009-03-13 23:53:18 +00:00
|
|
|
#include <atomic.h>
|
2012-03-20 23:00:23 +00:00
|
|
|
#include <_itoa.h>
|
2006-08-22 06:19:12 +00:00
|
|
|
#include <bits/wordsize.h>
|
2009-03-13 23:53:18 +00:00
|
|
|
#include <sys/sysinfo.h>
|
2004-10-06 18:09:57 +00:00
|
|
|
|
2011-09-11 01:47:36 +00:00
|
|
|
#include <ldsodefs.h>
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <stdio.h> /* needed for malloc_stats */
|
2011-09-11 02:12:38 +00:00
|
|
|
#include <errno.h>
|
2018-01-29 21:49:45 +00:00
|
|
|
#include <assert.h>
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2012-05-21 19:02:33 +00:00
|
|
|
#include <shlib-compat.h>
|
|
|
|
|
2003-09-23 05:47:54 +00:00
|
|
|
/* For uintptr_t. */
|
|
|
|
#include <stdint.h>
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2004-08-21 20:19:54 +00:00
|
|
|
/* For va_arg, va_start, va_end. */
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
2013-11-21 23:49:50 +00:00
|
|
|
/* For MIN, MAX, powerof2. */
|
|
|
|
#include <sys/param.h>
|
|
|
|
|
2015-09-14 19:32:47 +00:00
|
|
|
/* For ALIGN_UP et. al. */
|
Narrowing the visibility of libc-internal.h even further.
posix/wordexp-test.c used libc-internal.h for PTR_ALIGN_DOWN; similar
to what was done with libc-diag.h, I have split the definitions of
cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and PTR_ALIGN_DOWN
to a new header, libc-pointer-arith.h.
It then occurred to me that the remaining declarations in libc-internal.h
are mostly to do with early initialization, and probably most of the
files including it, even in the core code, don't need it anymore. Indeed,
only 19 files actually need what remains of libc-internal.h. 23 others
need libc-diag.h instead, and 12 need libc-pointer-arith.h instead.
No file needs more than one of them, and 16 don't need any of them!
So, with this patch, libc-internal.h stops including libc-diag.h as
well as losing the pointer arithmetic macros, and all including files
are adjusted.
* include/libc-pointer-arith.h: New file. Define
cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and
PTR_ALIGN_DOWN here.
* include/libc-internal.h: Definitions of above macros
moved from here. Don't include libc-diag.h anymore either.
* posix/wordexp-test.c: Include stdint.h and libc-pointer-arith.h.
Don't include libc-internal.h.
* debug/pcprofile.c, elf/dl-tunables.c, elf/soinit.c, io/openat.c
* io/openat64.c, misc/ptrace.c, nptl/pthread_clock_gettime.c
* nptl/pthread_clock_settime.c, nptl/pthread_cond_common.c
* string/strcoll_l.c, sysdeps/nacl/brk.c
* sysdeps/unix/clock_settime.c
* sysdeps/unix/sysv/linux/i386/get_clockfreq.c
* sysdeps/unix/sysv/linux/ia64/get_clockfreq.c
* sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c:
Don't include libc-internal.h.
* elf/get-dynamic-info.h, iconv/loop.c
* iconvdata/iso-2022-cn-ext.c, locale/weight.h, locale/weightwc.h
* misc/reboot.c, nis/nis_table.c, nptl_db/thread_dbP.h
* nscd/connections.c, resolv/res_send.c, soft-fp/fmadf4.c
* soft-fp/fmasf4.c, soft-fp/fmatf4.c, stdio-common/vfscanf.c
* sysdeps/ieee754/dbl-64/e_lgamma_r.c
* sysdeps/ieee754/dbl-64/k_rem_pio2.c
* sysdeps/ieee754/flt-32/e_lgammaf_r.c
* sysdeps/ieee754/flt-32/k_rem_pio2f.c
* sysdeps/ieee754/ldbl-128/k_tanl.c
* sysdeps/ieee754/ldbl-128ibm/k_tanl.c
* sysdeps/ieee754/ldbl-96/e_lgammal_r.c
* sysdeps/ieee754/ldbl-96/k_tanl.c, sysdeps/nptl/futex-internal.h:
Include libc-diag.h instead of libc-internal.h.
* elf/dl-load.c, elf/dl-reloc.c, locale/programs/locarchive.c
* nptl/nptl-init.c, string/strcspn.c, string/strspn.c
* malloc/malloc.c, sysdeps/i386/nptl/tls.h
* sysdeps/nacl/dl-map-segments.h, sysdeps/x86_64/atomic-machine.h
* sysdeps/unix/sysv/linux/spawni.c
* sysdeps/x86_64/nptl/tls.h:
Include libc-pointer-arith.h instead of libc-internal.h.
* elf/get-dynamic-info.h, sysdeps/nacl/dl-map-segments.h
* sysdeps/x86_64/atomic-machine.h:
Add multiple include guard.
2017-02-27 01:17:52 +00:00
|
|
|
#include <libc-pointer-arith.h>
|
2015-02-18 00:25:01 +00:00
|
|
|
|
2017-07-06 17:37:30 +00:00
|
|
|
/* For DIAG_PUSH/POP_NEEDS_COMMENT et al. */
|
|
|
|
#include <libc-diag.h>
|
|
|
|
|
2020-12-21 15:03:03 +00:00
|
|
|
/* For memory tagging. */
|
|
|
|
#include <libc-mtag.h>
|
|
|
|
|
2016-04-14 07:17:02 +00:00
|
|
|
#include <malloc/malloc-internal.h>
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
|
2017-10-20 16:39:47 +00:00
|
|
|
/* For SINGLE_THREAD_P. */
|
|
|
|
#include <sysdep-cancel.h>
|
|
|
|
|
2020-12-16 14:09:52 +00:00
|
|
|
#include <libc-internal.h>
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
Debugging:
|
|
|
|
|
|
|
|
Because freed chunks may be overwritten with bookkeeping fields, this
|
|
|
|
malloc will often die when freed memory is overwritten by user
|
|
|
|
programs. This can be very effective (albeit in an annoying way)
|
|
|
|
in helping track down dangling pointers.
|
|
|
|
|
|
|
|
If you compile with -DMALLOC_DEBUG, a number of assertion checks are
|
|
|
|
enabled that will catch more memory errors. You probably won't be
|
|
|
|
able to make much sense of the actual assertion errors, but they
|
|
|
|
should help you locate incorrectly overwritten memory. The checking
|
|
|
|
is fairly extensive, and will slow down execution
|
|
|
|
noticeably. Calling malloc_stats or mallinfo with MALLOC_DEBUG set
|
|
|
|
will attempt to check every non-mmapped allocated and free chunk in
|
|
|
|
the course of computing the summmaries. (By nature, mmapped regions
|
|
|
|
cannot be checked very much automatically.)
|
|
|
|
|
|
|
|
Setting MALLOC_DEBUG may also be helpful if you are trying to modify
|
|
|
|
this code. The assertions in the check routines spell out in more
|
|
|
|
detail the assumptions and invariants underlying the algorithms.
|
|
|
|
|
|
|
|
Setting MALLOC_DEBUG does NOT provide an automated mechanism for
|
|
|
|
checking that all accesses to malloced memory stay within their
|
|
|
|
bounds. However, there are several add-ons and adaptations of this
|
|
|
|
or other mallocs available that do this.
|
1996-12-08 08:01:13 +00:00
|
|
|
*/
|
|
|
|
|
2014-03-31 14:00:32 +00:00
|
|
|
#ifndef MALLOC_DEBUG
|
|
|
|
#define MALLOC_DEBUG 0
|
|
|
|
#endif
|
|
|
|
|
2018-01-29 21:49:45 +00:00
|
|
|
#ifndef NDEBUG
|
|
|
|
# define __assert_fail(assertion, file, line, function) \
|
|
|
|
__malloc_assert(assertion, file, line, function)
|
2009-08-31 11:55:10 +00:00
|
|
|
|
|
|
|
extern const char *__progname;
|
|
|
|
|
|
|
|
static void
|
|
|
|
__malloc_assert (const char *assertion, const char *file, unsigned int line,
|
|
|
|
const char *function)
|
|
|
|
{
|
|
|
|
(void) __fxprintf (NULL, "%s%s%s:%u: %s%sAssertion `%s' failed.\n",
|
|
|
|
__progname, __progname[0] ? ": " : "",
|
|
|
|
file, line,
|
|
|
|
function ? function : "", function ? ": " : "",
|
|
|
|
assertion);
|
|
|
|
fflush (stderr);
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
#endif
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
/* We want 64 entries. This is an arbitrary limit, which tunables can reduce. */
|
|
|
|
# define TCACHE_MAX_BINS 64
|
|
|
|
# define MAX_TCACHE_SIZE tidx2usize (TCACHE_MAX_BINS-1)
|
|
|
|
|
|
|
|
/* Only used to pre-fill the tunables. */
|
|
|
|
# define tidx2usize(idx) (((size_t) idx) * MALLOC_ALIGNMENT + MINSIZE - SIZE_SZ)
|
|
|
|
|
|
|
|
/* When "x" is from chunksize(). */
|
|
|
|
# define csize2tidx(x) (((x) - MINSIZE + MALLOC_ALIGNMENT - 1) / MALLOC_ALIGNMENT)
|
|
|
|
/* When "x" is a user-provided size. */
|
|
|
|
# define usize2tidx(x) csize2tidx (request2size (x))
|
|
|
|
|
|
|
|
/* With rounding and alignment, the bins are...
|
|
|
|
idx 0 bytes 0..24 (64-bit) or 0..12 (32-bit)
|
|
|
|
idx 1 bytes 25..40 or 13..20
|
|
|
|
idx 2 bytes 41..56 or 21..28
|
|
|
|
etc. */
|
|
|
|
|
|
|
|
/* This is another arbitrary limit, which tunables can change. Each
|
|
|
|
tcache bin will hold at most this number of chunks. */
|
|
|
|
# define TCACHE_FILL_COUNT 7
|
2019-05-17 17:16:20 +00:00
|
|
|
|
|
|
|
/* Maximum chunks in tcache bins for tunables. This value must fit the range
|
|
|
|
of tcache->counts[] entries, else they may overflow. */
|
|
|
|
# define MAX_TCACHE_COUNT UINT16_MAX
|
2017-07-06 17:37:30 +00:00
|
|
|
#endif
|
|
|
|
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
/* Safe-Linking:
|
|
|
|
Use randomness from ASLR (mmap_base) to protect single-linked lists
|
|
|
|
of Fast-Bins and TCache. That is, mask the "next" pointers of the
|
|
|
|
lists' chunks, and also perform allocation alignment checks on them.
|
|
|
|
This mechanism reduces the risk of pointer hijacking, as was done with
|
|
|
|
Safe-Unlinking in the double-linked lists of Small-Bins.
|
|
|
|
It assumes a minimum page size of 4096 bytes (12 bits). Systems with
|
|
|
|
larger pages provide less entropy, although the pointer mangling
|
|
|
|
still works. */
|
|
|
|
#define PROTECT_PTR(pos, ptr) \
|
|
|
|
((__typeof (ptr)) ((((size_t) pos) >> 12) ^ ((size_t) ptr)))
|
|
|
|
#define REVEAL_PTR(ptr) PROTECT_PTR (&ptr, ptr)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2021-04-12 07:33:15 +00:00
|
|
|
The REALLOC_ZERO_BYTES_FREES macro controls the behavior of realloc (p, 0)
|
|
|
|
when p is nonnull. If the macro is nonzero, the realloc call returns NULL;
|
|
|
|
otherwise, the call returns what malloc (0) would. In either case,
|
|
|
|
p is freed. Glibc uses a nonzero REALLOC_ZERO_BYTES_FREES, which
|
|
|
|
implements common historical practice.
|
|
|
|
|
|
|
|
ISO C17 says the realloc call has implementation-defined behavior,
|
|
|
|
and it might not even free p.
|
2002-01-29 07:54:51 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef REALLOC_ZERO_BYTES_FREES
|
|
|
|
#define REALLOC_ZERO_BYTES_FREES 1
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
TRIM_FASTBINS controls whether free() of a very small chunk can
|
|
|
|
immediately lead to trimming. Setting to true (1) can reduce memory
|
|
|
|
footprint, but will almost always slow down programs that use a lot
|
|
|
|
of small chunks.
|
|
|
|
|
|
|
|
Define this only if you are willing to give up some speed to more
|
|
|
|
aggressively reduce system-level memory footprint when releasing
|
|
|
|
memory in programs that use many small chunks. You can get
|
|
|
|
essentially the same effect by setting MXFAST to 0, but this can
|
|
|
|
lead to even greater slowdowns in programs using many small chunks.
|
|
|
|
TRIM_FASTBINS is an in-between compile-time option, that disables
|
|
|
|
only those chunks bordering topmost memory from being placed in
|
|
|
|
fastbins.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef TRIM_FASTBINS
|
|
|
|
#define TRIM_FASTBINS 0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2012-01-31 23:49:22 +00:00
|
|
|
/* Definition for getting more memory from the OS. */
|
2002-01-29 07:54:51 +00:00
|
|
|
#define MORECORE (*__morecore)
|
|
|
|
#define MORECORE_FAILURE 0
|
2011-09-10 22:10:17 +00:00
|
|
|
void * __default_morecore (ptrdiff_t);
|
|
|
|
void *(*__morecore)(ptrdiff_t) = __default_morecore;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2020-12-21 15:03:03 +00:00
|
|
|
/* Memory tagging. */
|
|
|
|
|
|
|
|
/* Some systems support the concept of tagging (sometimes known as
|
|
|
|
coloring) memory locations on a fine grained basis. Each memory
|
|
|
|
location is given a color (normally allocated randomly) and
|
|
|
|
pointers are also colored. When the pointer is dereferenced, the
|
|
|
|
pointer's color is checked against the memory's color and if they
|
|
|
|
differ the access is faulted (sometimes lazily).
|
|
|
|
|
|
|
|
We use this in glibc by maintaining a single color for the malloc
|
|
|
|
data structures that are interleaved with the user data and then
|
|
|
|
assigning separate colors for each block allocation handed out. In
|
|
|
|
this way simple buffer overruns will be rapidly detected. When
|
|
|
|
memory is freed, the memory is recolored back to the glibc default
|
|
|
|
so that simple use-after-free errors can also be detected.
|
|
|
|
|
|
|
|
If memory is reallocated the buffer is recolored even if the
|
|
|
|
address remains the same. This has a performance impact, but
|
|
|
|
guarantees that the old pointer cannot mistakenly be reused (code
|
|
|
|
that compares old against new will see a mismatch and will then
|
|
|
|
need to behave as though realloc moved the data to a new location).
|
|
|
|
|
|
|
|
Internal API for memory tagging support.
|
|
|
|
|
|
|
|
The aim is to keep the code for memory tagging support as close to
|
|
|
|
the normal APIs in glibc as possible, so that if tagging is not
|
|
|
|
enabled in the library, or is disabled at runtime then standard
|
|
|
|
operations can continue to be used. Support macros are used to do
|
|
|
|
this:
|
|
|
|
|
2021-01-29 17:07:28 +00:00
|
|
|
void *tag_new_zero_region (void *ptr, size_t size)
|
2020-12-21 15:03:03 +00:00
|
|
|
|
2021-01-29 17:07:28 +00:00
|
|
|
Allocates a new tag, colors the memory with that tag, zeros the
|
|
|
|
memory and returns a pointer that is correctly colored for that
|
|
|
|
location. The non-tagging version will simply call memset with 0.
|
2020-12-21 15:03:03 +00:00
|
|
|
|
2021-02-16 14:12:25 +00:00
|
|
|
void *tag_region (void *ptr, size_t size)
|
2020-12-21 15:03:03 +00:00
|
|
|
|
|
|
|
Color the region of memory pointed to by PTR and size SIZE with
|
|
|
|
the color of PTR. Returns the original pointer.
|
|
|
|
|
2021-02-16 14:12:25 +00:00
|
|
|
void *tag_new_usable (void *ptr)
|
2020-12-21 15:03:03 +00:00
|
|
|
|
|
|
|
Allocate a new random color and use it to color the user region of
|
|
|
|
a chunk; this may include data from the subsequent chunk's header
|
|
|
|
if tagging is sufficiently fine grained. Returns PTR suitably
|
|
|
|
recolored for accessing the memory there.
|
|
|
|
|
2021-02-16 14:12:25 +00:00
|
|
|
void *tag_at (void *ptr)
|
2020-12-21 15:03:03 +00:00
|
|
|
|
|
|
|
Read the current color of the memory at the address pointed to by
|
|
|
|
PTR (ignoring it's current color) and return PTR recolored to that
|
|
|
|
color. PTR must be valid address in all other respects. When
|
|
|
|
tagging is not enabled, it simply returns the original pointer.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef USE_MTAG
|
2021-01-27 15:45:43 +00:00
|
|
|
static bool mtag_enabled = false;
|
|
|
|
static int mtag_mmap_flags = 0;
|
|
|
|
#else
|
|
|
|
# define mtag_enabled false
|
|
|
|
# define mtag_mmap_flags 0
|
|
|
|
#endif
|
2020-12-21 15:03:03 +00:00
|
|
|
|
2021-01-27 15:45:43 +00:00
|
|
|
static __always_inline void *
|
|
|
|
tag_region (void *ptr, size_t size)
|
2020-12-21 15:03:03 +00:00
|
|
|
{
|
2021-01-27 15:45:43 +00:00
|
|
|
if (__glibc_unlikely (mtag_enabled))
|
|
|
|
return __libc_mtag_tag_region (ptr, size);
|
2020-12-21 15:03:03 +00:00
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
2021-01-27 15:45:43 +00:00
|
|
|
static __always_inline void *
|
2021-01-29 17:07:28 +00:00
|
|
|
tag_new_zero_region (void *ptr, size_t size)
|
2020-12-21 15:03:03 +00:00
|
|
|
{
|
2021-01-27 15:45:43 +00:00
|
|
|
if (__glibc_unlikely (mtag_enabled))
|
2021-01-29 17:07:28 +00:00
|
|
|
return __libc_mtag_tag_zero_region (__libc_mtag_new_tag (ptr), size);
|
|
|
|
return memset (ptr, 0, size);
|
2020-12-21 15:03:03 +00:00
|
|
|
}
|
|
|
|
|
2021-01-27 15:45:43 +00:00
|
|
|
/* Defined later. */
|
|
|
|
static void *
|
|
|
|
tag_new_usable (void *ptr);
|
2020-12-21 15:03:03 +00:00
|
|
|
|
2021-01-27 15:45:43 +00:00
|
|
|
static __always_inline void *
|
|
|
|
tag_at (void *ptr)
|
|
|
|
{
|
|
|
|
if (__glibc_unlikely (mtag_enabled))
|
|
|
|
return __libc_mtag_address_get_tag (ptr);
|
|
|
|
return ptr;
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2011-09-10 22:10:17 +00:00
|
|
|
#include <string.h>
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
MORECORE-related declarations. By default, rely on sbrk
|
|
|
|
*/
|
2000-12-31 07:39:50 +00:00
|
|
|
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
MORECORE is the name of the routine to call to obtain more memory
|
|
|
|
from the system. See below for general guidance on writing
|
|
|
|
alternative MORECORE functions, as well as a version for WIN32 and a
|
|
|
|
sample version for pre-OSX macos.
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#ifndef MORECORE
|
|
|
|
#define MORECORE sbrk
|
|
|
|
#endif
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
MORECORE_FAILURE is the value returned upon failure of MORECORE
|
|
|
|
as well as mmap. Since it cannot be an otherwise valid memory address,
|
|
|
|
and must reflect values of standard sys calls, you probably ought not
|
|
|
|
try to redefine it.
|
|
|
|
*/
|
2000-12-31 07:39:50 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#ifndef MORECORE_FAILURE
|
|
|
|
#define MORECORE_FAILURE (-1)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
If MORECORE_CONTIGUOUS is true, take advantage of fact that
|
|
|
|
consecutive calls to MORECORE with positive arguments always return
|
|
|
|
contiguous increasing addresses. This is true of unix sbrk. Even
|
|
|
|
if not defined, when regions happen to be contiguous, malloc will
|
|
|
|
permit allocations spanning regions obtained from different
|
|
|
|
calls. But defining this when applicable enables some stronger
|
|
|
|
consistency checks and space efficiencies.
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#ifndef MORECORE_CONTIGUOUS
|
|
|
|
#define MORECORE_CONTIGUOUS 1
|
1996-12-08 08:01:13 +00:00
|
|
|
#endif
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
Define MORECORE_CANNOT_TRIM if your version of MORECORE
|
|
|
|
cannot release space back to the system when given negative
|
|
|
|
arguments. This is generally necessary only if you are using
|
|
|
|
a hand-crafted MORECORE function that cannot handle negative arguments.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* #define MORECORE_CANNOT_TRIM */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* MORECORE_CLEARS (default 1)
|
|
|
|
The degree to which the routine mapped to MORECORE zeroes out
|
|
|
|
memory: never (0), only for newly allocated space (1) or always
|
|
|
|
(2). The distinction between (1) and (2) is necessary because on
|
|
|
|
some systems, if the application first decrements and then
|
|
|
|
increments the break value, the contents of the reallocated space
|
|
|
|
are unspecified.
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
#ifndef MORECORE_CLEARS
|
2014-01-02 08:38:18 +00:00
|
|
|
# define MORECORE_CLEARS 1
|
1998-08-03 16:47:01 +00:00
|
|
|
#endif
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
/*
|
2002-01-29 07:54:51 +00:00
|
|
|
MMAP_AS_MORECORE_SIZE is the minimum mmap size argument to use if
|
2011-09-10 22:10:17 +00:00
|
|
|
sbrk fails, and mmap is used as a backup. The value must be a
|
|
|
|
multiple of page size. This backup strategy generally applies only
|
|
|
|
when systems have "holes" in address space, so sbrk cannot perform
|
|
|
|
contiguous expansion, but there is still space available on system.
|
|
|
|
On systems for which this is known to be useful (i.e. most linux
|
|
|
|
kernels), this occurs only when programs allocate huge amounts of
|
|
|
|
memory. Between this, and the fact that mmap regions tend to be
|
|
|
|
limited, the size should be large, to avoid too many mmap calls and
|
|
|
|
thus avoid running out of kernel resources. */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
#ifndef MMAP_AS_MORECORE_SIZE
|
|
|
|
#define MMAP_AS_MORECORE_SIZE (1024 * 1024)
|
1996-12-08 08:01:13 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
Define HAVE_MREMAP to make realloc() use mremap() to re-allocate
|
2013-01-17 20:08:12 +00:00
|
|
|
large blocks.
|
1996-12-08 08:01:13 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef HAVE_MREMAP
|
2002-01-29 07:54:51 +00:00
|
|
|
#define HAVE_MREMAP 0
|
1996-12-08 08:01:13 +00:00
|
|
|
#endif
|
|
|
|
|
2016-06-10 08:46:05 +00:00
|
|
|
/* We may need to support __malloc_initialize_hook for backwards
|
|
|
|
compatibility. */
|
|
|
|
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_24)
|
|
|
|
# define HAVE_MALLOC_INIT_HOOK 1
|
|
|
|
#else
|
|
|
|
# define HAVE_MALLOC_INIT_HOOK 0
|
|
|
|
#endif
|
|
|
|
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
This version of malloc supports the standard SVID/XPG mallinfo
|
2002-01-29 07:54:51 +00:00
|
|
|
routine that returns a struct containing usage properties and
|
|
|
|
statistics. It should work on any SVID/XPG compliant system that has
|
|
|
|
a /usr/include/malloc.h defining struct mallinfo. (If you'd like to
|
|
|
|
install such a thing yourself, cut out the preliminary declarations
|
|
|
|
as described above and below and save them in a malloc.h file. But
|
|
|
|
there's no compelling reason to bother to do this.)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
The main declaration needed is the mallinfo struct that is returned
|
|
|
|
(by-copy) by mallinfo(). The SVID/XPG malloinfo struct contains a
|
2002-01-29 07:54:51 +00:00
|
|
|
bunch of fields that are not even meaningful in this version of
|
|
|
|
malloc. These fields are are instead filled by mallinfo() with
|
|
|
|
other numbers that might be of interest.
|
1996-12-08 08:01:13 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* ---------- description of public routines ------------ */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
2002-01-29 07:54:51 +00:00
|
|
|
malloc(size_t n)
|
|
|
|
Returns a pointer to a newly allocated chunk of at least n bytes, or null
|
|
|
|
if no space is available. Additionally, on failure, errno is
|
|
|
|
set to ENOMEM on ANSI C systems.
|
|
|
|
|
2020-10-06 12:15:11 +00:00
|
|
|
If n is zero, malloc returns a minimum-sized chunk. (The minimum
|
2002-01-29 07:54:51 +00:00
|
|
|
size is 16 bytes on most 32bit systems, and 24 or 32 bytes on 64bit
|
|
|
|
systems.) On most systems, size_t is an unsigned type, so calls
|
|
|
|
with negative arguments are interpreted as requests for huge amounts
|
|
|
|
of space, which will often fail. The maximum supported value of n
|
|
|
|
differs across systems, but is in all cases less than the maximum
|
|
|
|
representable value of a size_t.
|
1996-12-08 08:01:13 +00:00
|
|
|
*/
|
2012-01-31 23:49:22 +00:00
|
|
|
void* __libc_malloc(size_t);
|
|
|
|
libc_hidden_proto (__libc_malloc)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2011-09-10 22:10:17 +00:00
|
|
|
free(void* p)
|
2002-01-29 07:54:51 +00:00
|
|
|
Releases the chunk of memory pointed to by p, that had been previously
|
|
|
|
allocated using malloc or a related routine such as realloc.
|
|
|
|
It has no effect if p is null. It can have arbitrary (i.e., bad!)
|
|
|
|
effects if p has already been freed.
|
|
|
|
|
|
|
|
Unless disabled (using mallopt), freeing very large spaces will
|
|
|
|
when possible, automatically trigger operations that give
|
|
|
|
back unused memory to the system, thus reducing program footprint.
|
|
|
|
*/
|
2012-01-31 23:49:22 +00:00
|
|
|
void __libc_free(void*);
|
|
|
|
libc_hidden_proto (__libc_free)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
calloc(size_t n_elements, size_t element_size);
|
|
|
|
Returns a pointer to n_elements * element_size bytes, with all locations
|
|
|
|
set to zero.
|
|
|
|
*/
|
2012-01-31 23:49:22 +00:00
|
|
|
void* __libc_calloc(size_t, size_t);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
2011-09-10 22:10:17 +00:00
|
|
|
realloc(void* p, size_t n)
|
2002-01-29 07:54:51 +00:00
|
|
|
Returns a pointer to a chunk of size n that contains the same data
|
|
|
|
as does chunk p up to the minimum of (n, p's size) bytes, or null
|
2002-02-07 05:30:48 +00:00
|
|
|
if no space is available.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
The returned pointer may or may not be the same as p. The algorithm
|
|
|
|
prefers extending p when possible, otherwise it employs the
|
|
|
|
equivalent of a malloc-copy-free sequence.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
If p is null, realloc is equivalent to malloc.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
If space is not available, realloc returns null, errno is set (if on
|
|
|
|
ANSI) and p is NOT freed.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
if n is for fewer bytes than already held by p, the newly unused
|
|
|
|
space is lopped off and freed if possible. Unless the #define
|
|
|
|
REALLOC_ZERO_BYTES_FREES is set, realloc with a size argument of
|
|
|
|
zero (re)allocates a minimum-sized chunk.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-05-03 20:25:15 +00:00
|
|
|
Large chunks that were internally obtained via mmap will always be
|
|
|
|
grown using malloc-copy-free sequences unless the system supports
|
|
|
|
MREMAP (currently only linux).
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
The old unix realloc convention of allowing the last-free'd chunk
|
|
|
|
to be used as an argument to realloc is not supported.
|
1996-12-08 08:01:13 +00:00
|
|
|
*/
|
2012-01-31 23:49:22 +00:00
|
|
|
void* __libc_realloc(void*, size_t);
|
|
|
|
libc_hidden_proto (__libc_realloc)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
memalign(size_t alignment, size_t n);
|
|
|
|
Returns a pointer to a newly allocated chunk of n bytes, aligned
|
|
|
|
in accord with the alignment argument.
|
|
|
|
|
|
|
|
The alignment argument should be a power of two. If the argument is
|
|
|
|
not a power of two, the nearest greater power is used.
|
|
|
|
8-byte alignment is guaranteed by normal malloc calls, so don't
|
|
|
|
bother calling memalign with an argument of 8 or less.
|
|
|
|
|
|
|
|
Overreliance on memalign is a sure way to fragment space.
|
|
|
|
*/
|
2012-01-31 23:49:22 +00:00
|
|
|
void* __libc_memalign(size_t, size_t);
|
|
|
|
libc_hidden_proto (__libc_memalign)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
2002-01-29 07:54:51 +00:00
|
|
|
valloc(size_t n);
|
|
|
|
Equivalent to memalign(pagesize, n), where pagesize is the page
|
|
|
|
size of the system. If the pagesize is unknown, 4096 is used.
|
|
|
|
*/
|
2012-01-31 23:49:22 +00:00
|
|
|
void* __libc_valloc(size_t);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
mallopt(int parameter_number, int parameter_value)
|
|
|
|
Sets tunable parameters The format is to provide a
|
|
|
|
(parameter-number, parameter-value) pair. mallopt then sets the
|
|
|
|
corresponding parameter to the argument value if it can (i.e., so
|
|
|
|
long as the value is meaningful), and returns 1 if successful else
|
|
|
|
0. SVID/XPG/ANSI defines four standard param numbers for mallopt,
|
|
|
|
normally defined in malloc.h. Only one of these (M_MXFAST) is used
|
|
|
|
in this malloc. The others (M_NLBLKS, M_GRAIN, M_KEEP) don't apply,
|
|
|
|
so setting them has no effect. But this malloc also supports four
|
|
|
|
other options in mallopt. See below for details. Briefly, supported
|
|
|
|
parameters are as follows (listed defaults are for "typical"
|
|
|
|
configurations).
|
|
|
|
|
|
|
|
Symbol param # default allowed param values
|
|
|
|
M_MXFAST 1 64 0-80 (0 disables fastbins)
|
|
|
|
M_TRIM_THRESHOLD -1 128*1024 any (-1U disables trimming)
|
2002-02-07 05:30:48 +00:00
|
|
|
M_TOP_PAD -2 0 any
|
2002-01-29 07:54:51 +00:00
|
|
|
M_MMAP_THRESHOLD -3 128*1024 any (or 0 if no MMAP support)
|
|
|
|
M_MMAP_MAX -4 65536 any (0 disables use of mmap)
|
|
|
|
*/
|
2012-01-31 23:49:22 +00:00
|
|
|
int __libc_mallopt(int, int);
|
|
|
|
libc_hidden_proto (__libc_mallopt)
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
mallinfo()
|
|
|
|
Returns (by copy) a struct containing various summary statistics:
|
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
arena: current total non-mmapped bytes allocated from system
|
|
|
|
ordblks: the number of free chunks
|
2002-01-29 07:54:51 +00:00
|
|
|
smblks: the number of fastbin blocks (i.e., small chunks that
|
2009-08-31 11:55:10 +00:00
|
|
|
have been freed but not use resused or consolidated)
|
2002-02-07 05:30:48 +00:00
|
|
|
hblks: current number of mmapped regions
|
|
|
|
hblkhd: total bytes held in mmapped regions
|
2016-02-19 16:07:04 +00:00
|
|
|
usmblks: always 0
|
2002-02-07 05:30:48 +00:00
|
|
|
fsmblks: total bytes held in fastbin blocks
|
2002-01-29 07:54:51 +00:00
|
|
|
uordblks: current total allocated space (normal or mmapped)
|
2002-02-07 05:30:48 +00:00
|
|
|
fordblks: total free space
|
2002-01-29 07:54:51 +00:00
|
|
|
keepcost: the maximum number of bytes that could ideally be released
|
2009-08-31 11:55:10 +00:00
|
|
|
back to system via malloc_trim. ("ideally" means that
|
|
|
|
it ignores page restrictions etc.)
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
Because these fields are ints, but internal bookkeeping may
|
2002-02-07 05:30:48 +00:00
|
|
|
be kept as longs, the reported values may wrap around zero and
|
2002-01-29 07:54:51 +00:00
|
|
|
thus be inaccurate.
|
|
|
|
*/
|
2020-07-07 11:58:24 +00:00
|
|
|
struct mallinfo2 __libc_mallinfo2(void);
|
2020-09-01 20:17:25 +00:00
|
|
|
libc_hidden_proto (__libc_mallinfo2)
|
2020-07-07 11:58:24 +00:00
|
|
|
|
2012-01-31 23:49:22 +00:00
|
|
|
struct mallinfo __libc_mallinfo(void);
|
[BZ #779]
2005-03-10 Jakub Jelinek <jakub@redhat.com>
* math/test-misc.c (main): Add some more tests.
2005-03-17 Jakub Jelinek <jakub@redhat.com>
* posix/regcomp.c (re_compile_fastmap_iter): Fix check for failed
__wcrtomb. Check return values of other __wcrtomb calls.
* posix/regex_internal.c (build_wcs_buffer, re_string_skip_chars):
Change mbclen type to size_t.
(build_wcs_upper_buffer): Change mbclen and mbcdlen type to size_t.
Handle mb chars whose upper case doesn't have multibyte representation
in locale's charset.
2005-03-15 Jakub Jelinek <jakub@redhat.com>
* malloc/malloc.c (_int_icalloc, _int_icomalloc, iALLOc,
public_iCALLOc, public_iCALLOc, public_iCOMALLOc): Protect with
#ifndef _LIBC.
[BZ #779]
* malloc/malloc.c (public_mTRIm): Initialize malloc if not yet
initialized.
2005-03-10 Jakub Jelinek <jakub@redhat.com>
* misc/sys/cdefs.h (__always_inline): Define.
* posix/bits/unistd.h (read, pread, pread64, readlink, getcwd, getwd):
Use __always_inline instead of __inline.
* socket/bits/socket2.h (recv, recvfrom): Likewise.
* libio/bits/stdio2.h (gets, fgets, fgets_unlocked): Likewise.
* string/bits/string3.h (__memcpy_ichk, __memmove_ichk, __mempcpy_ichk,
__memset_ichk, __strcpy_ichk, __stpcpy_ichk, __strncpy_ichk,
__strcat_ichk, __strncat_ichk): Use __always_inline instead of
__inline__ __attribute__ ((__always_inline__)).
2005-03-09 Jakub Jelinek <jakub@redhat.com>
* debug/tst-chk1.c: Include sys/socket.h and sys/un.h.
(do_test): Add new tests for recv, recvfrom, getcwd, getwd and
readlink. Add some more tests for read, pread, pread64, fgets and
fgets_unlocked.
* posix/bits/unistd.h (read, pread, pread64, readlink,
getcwd, getwd): Change macros into extern inline functions.
(__read_alias, __pread_alias, __pread64_alias, __readlink_alias,
__getcwd_alias, __getwd_alias): New prototypes.
* socket/bits/socket2.h (recv, recvfrom): Change macros into
extern inline functions.
(__recv_alias, __recvfrom_alias): New prototypes.
* libio/bits/stdio2.h (gets, fgets, fgets_unlocked): Change macros
into extern inline functions.
(__gets_alias, __fgets_alias, __fgets_unlocked_alias): New prototypes.
* debug/pread_chk.c (__pread_chk): Fix order of arguments passed
to __pread.
* debug/pread64_chk.c (__pread64_chk): Fix order of arguments passed
to __pread64.
2005-03-19 00:28:51 +00:00
|
|
|
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
pvalloc(size_t n);
|
|
|
|
Equivalent to valloc(minimum-page-that-holds(n)), that is,
|
|
|
|
round up n to nearest pagesize.
|
|
|
|
*/
|
2012-01-31 23:49:22 +00:00
|
|
|
void* __libc_pvalloc(size_t);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
malloc_trim(size_t pad);
|
|
|
|
|
|
|
|
If possible, gives memory back to the system (via negative
|
|
|
|
arguments to sbrk) if there is unused memory at the `high' end of
|
|
|
|
the malloc pool. You can call this after freeing large blocks of
|
|
|
|
memory to potentially reduce the system-level memory requirements
|
|
|
|
of a program. However, it cannot guarantee to reduce memory. Under
|
|
|
|
some allocation patterns, some large free blocks of memory will be
|
|
|
|
locked between two used chunks, so they cannot be given back to
|
|
|
|
the system.
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
The `pad' argument to malloc_trim represents the amount of free
|
|
|
|
trailing space to leave untrimmed. If this argument is zero,
|
|
|
|
only the minimum amount of memory to maintain internal data
|
|
|
|
structures will be left (one page or less). Non-zero arguments
|
|
|
|
can be supplied to maintain enough trailing space to service
|
|
|
|
future expected allocations without having to re-obtain memory
|
|
|
|
from the system.
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
Malloc_trim returns 1 if it actually released any memory, else 0.
|
|
|
|
On systems that do not support "negative sbrks", it will always
|
2008-03-04 18:36:27 +00:00
|
|
|
return 0.
|
2002-01-29 07:54:51 +00:00
|
|
|
*/
|
2012-01-31 23:49:22 +00:00
|
|
|
int __malloc_trim(size_t);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/*
|
2011-09-10 22:10:17 +00:00
|
|
|
malloc_usable_size(void* p);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
Returns the number of bytes you can actually use in
|
|
|
|
an allocated chunk, which may be more than you requested (although
|
|
|
|
often not) due to alignment and minimum size constraints.
|
|
|
|
You can use this many bytes without worrying about
|
|
|
|
overwriting other allocated objects. This is not a particularly great
|
|
|
|
programming practice. malloc_usable_size can be more useful in
|
|
|
|
debugging and assertions, for example:
|
|
|
|
|
|
|
|
p = malloc(n);
|
|
|
|
assert(malloc_usable_size(p) >= 256);
|
|
|
|
|
|
|
|
*/
|
2012-01-31 23:49:22 +00:00
|
|
|
size_t __malloc_usable_size(void*);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
malloc_stats();
|
|
|
|
Prints on stderr the amount of space obtained from the system (both
|
|
|
|
via sbrk and mmap), the maximum amount (which may be more than
|
|
|
|
current if malloc_trim and/or munmap got called), and the current
|
|
|
|
number of bytes allocated via malloc (or realloc, etc) but not yet
|
|
|
|
freed. Note that this is the number of bytes allocated, not the
|
|
|
|
number requested. It will be larger than the number requested
|
|
|
|
because of alignment and bookkeeping overhead. Because it includes
|
|
|
|
alignment wastage as being in use, this figure may be greater than
|
|
|
|
zero even when no user-level chunks are allocated.
|
|
|
|
|
|
|
|
The reported current and maximum system memory can be inaccurate if
|
|
|
|
a program makes other calls to system memory allocation functions
|
|
|
|
(normally sbrk) outside of malloc.
|
|
|
|
|
|
|
|
malloc_stats prints only the most commonly interesting statistics.
|
|
|
|
More information can be obtained by calling mallinfo.
|
|
|
|
|
|
|
|
*/
|
2012-01-31 23:49:22 +00:00
|
|
|
void __malloc_stats(void);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-04-03 00:36:12 +00:00
|
|
|
/*
|
|
|
|
posix_memalign(void **memptr, size_t alignment, size_t size);
|
|
|
|
|
|
|
|
POSIX wrapper like memalign(), checking for validity of size.
|
|
|
|
*/
|
|
|
|
int __posix_memalign(void **, size_t, size_t);
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* mallopt tuning options */
|
|
|
|
|
1996-12-08 08:01:13 +00:00
|
|
|
/*
|
2002-01-29 07:54:51 +00:00
|
|
|
M_MXFAST is the maximum request size used for "fastbins", special bins
|
|
|
|
that hold returned chunks without consolidating their spaces. This
|
|
|
|
enables future requests for chunks of the same size to be handled
|
|
|
|
very quickly, but can increase fragmentation, and thus increase the
|
|
|
|
overall memory footprint of a program.
|
|
|
|
|
|
|
|
This malloc manages fastbins very conservatively yet still
|
|
|
|
efficiently, so fragmentation is rarely a problem for values less
|
|
|
|
than or equal to the default. The maximum supported value of MXFAST
|
|
|
|
is 80. You wouldn't want it any higher than this anyway. Fastbins
|
|
|
|
are designed especially for use with many small structs, objects or
|
|
|
|
strings -- the default handles structs/objects/arrays with sizes up
|
|
|
|
to 8 4byte fields, or small strings representing words, tokens,
|
|
|
|
etc. Using fastbins for larger objects normally worsens
|
|
|
|
fragmentation without improving speed.
|
|
|
|
|
|
|
|
M_MXFAST is set in REQUEST size units. It is internally used in
|
|
|
|
chunksize units, which adds padding and alignment. You can reduce
|
|
|
|
M_MXFAST to 0 to disable all use of fastbins. This causes the malloc
|
|
|
|
algorithm to be a closer approximation of fifo-best-fit in all cases,
|
|
|
|
not just for larger requests, but will generally cause it to be
|
|
|
|
slower.
|
1996-12-08 08:01:13 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* M_MXFAST is a standard SVID/XPG tuning option, usually listed in malloc.h */
|
|
|
|
#ifndef M_MXFAST
|
2002-02-07 05:30:48 +00:00
|
|
|
#define M_MXFAST 1
|
2002-01-29 07:54:51 +00:00
|
|
|
#endif
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#ifndef DEFAULT_MXFAST
|
2009-03-13 23:53:18 +00:00
|
|
|
#define DEFAULT_MXFAST (64 * SIZE_SZ / 4)
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
M_TRIM_THRESHOLD is the maximum amount of unused top-most memory
|
|
|
|
to keep before releasing via malloc_trim in free().
|
|
|
|
|
|
|
|
Automatic trimming is mainly useful in long-lived programs.
|
|
|
|
Because trimming via sbrk can be slow on some systems, and can
|
|
|
|
sometimes be wasteful (in cases where programs immediately
|
|
|
|
afterward allocate more large chunks) the value should be high
|
|
|
|
enough so that your overall system performance would improve by
|
|
|
|
releasing this much memory.
|
|
|
|
|
|
|
|
The trim threshold and the mmap control parameters (see below)
|
|
|
|
can be traded off with one another. Trimming and mmapping are
|
|
|
|
two different ways of releasing unused memory back to the
|
|
|
|
system. Between these two, it is often possible to keep
|
|
|
|
system-level demands of a long-lived program down to a bare
|
|
|
|
minimum. For example, in one test suite of sessions measuring
|
|
|
|
the XF86 X server on Linux, using a trim threshold of 128K and a
|
|
|
|
mmap threshold of 192K led to near-minimal long term resource
|
|
|
|
consumption.
|
|
|
|
|
|
|
|
If you are using this malloc in a long-lived program, it should
|
|
|
|
pay to experiment with these values. As a rough guide, you
|
|
|
|
might set to a value close to the average size of a process
|
|
|
|
(program) running on your system. Releasing this much memory
|
|
|
|
would allow such a process to run in memory. Generally, it's
|
|
|
|
worth it to tune for trimming rather tham memory mapping when a
|
|
|
|
program undergoes phases where several large chunks are
|
|
|
|
allocated and released in ways that can reuse each other's
|
|
|
|
storage, perhaps mixed with phases where there are no such
|
|
|
|
chunks at all. And in well-behaved long-lived programs,
|
|
|
|
controlling release of large blocks via trimming versus mapping
|
|
|
|
is usually faster.
|
|
|
|
|
|
|
|
However, in most programs, these parameters serve mainly as
|
|
|
|
protection against the system-level effects of carrying around
|
|
|
|
massive amounts of unneeded memory. Since frequent calls to
|
|
|
|
sbrk, mmap, and munmap otherwise degrade performance, the default
|
|
|
|
parameters are set to relatively high values that serve only as
|
|
|
|
safeguards.
|
|
|
|
|
|
|
|
The trim value It must be greater than page size to have any useful
|
2002-02-07 05:30:48 +00:00
|
|
|
effect. To disable trimming completely, you can set to
|
2002-01-29 07:54:51 +00:00
|
|
|
(unsigned long)(-1)
|
|
|
|
|
|
|
|
Trim settings interact with fastbin (MXFAST) settings: Unless
|
|
|
|
TRIM_FASTBINS is defined, automatic trimming never takes place upon
|
|
|
|
freeing a chunk with size less than or equal to MXFAST. Trimming is
|
|
|
|
instead delayed until subsequent freeing of larger chunks. However,
|
|
|
|
you can still force an attempted trim by calling malloc_trim.
|
|
|
|
|
|
|
|
Also, trimming is not generally possible in cases where
|
|
|
|
the main arena is obtained via mmap.
|
|
|
|
|
|
|
|
Note that the trick some people use of mallocing a huge space and
|
|
|
|
then freeing it at program startup, in an attempt to reserve system
|
|
|
|
memory, doesn't have the intended effect under automatic trimming,
|
|
|
|
since that memory will immediately be returned to the system.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define M_TRIM_THRESHOLD -1
|
|
|
|
|
|
|
|
#ifndef DEFAULT_TRIM_THRESHOLD
|
|
|
|
#define DEFAULT_TRIM_THRESHOLD (128 * 1024)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
M_TOP_PAD is the amount of extra `padding' space to allocate or
|
|
|
|
retain whenever sbrk is called. It is used in two ways internally:
|
|
|
|
|
|
|
|
* When sbrk is called to extend the top of the arena to satisfy
|
|
|
|
a new malloc request, this much padding is added to the sbrk
|
|
|
|
request.
|
|
|
|
|
|
|
|
* When malloc_trim is called automatically from free(),
|
|
|
|
it is used as the `pad' argument.
|
|
|
|
|
|
|
|
In both cases, the actual amount of padding is rounded
|
|
|
|
so that the end of the arena is always a system page boundary.
|
|
|
|
|
|
|
|
The main reason for using padding is to avoid calling sbrk so
|
|
|
|
often. Having even a small pad greatly reduces the likelihood
|
|
|
|
that nearly every malloc request during program start-up (or
|
|
|
|
after trimming) will invoke sbrk, which needlessly wastes
|
|
|
|
time.
|
|
|
|
|
|
|
|
Automatic rounding-up to page-size units is normally sufficient
|
|
|
|
to avoid measurable overhead, so the default is 0. However, in
|
|
|
|
systems where sbrk is relatively slow, it can pay to increase
|
|
|
|
this value, at the expense of carrying around more memory than
|
|
|
|
the program needs.
|
|
|
|
*/
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#define M_TOP_PAD -2
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#ifndef DEFAULT_TOP_PAD
|
|
|
|
#define DEFAULT_TOP_PAD (0)
|
|
|
|
#endif
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2006-08-09 21:51:56 +00:00
|
|
|
/*
|
|
|
|
MMAP_THRESHOLD_MAX and _MIN are the bounds on the dynamically
|
|
|
|
adjusted MMAP_THRESHOLD.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef DEFAULT_MMAP_THRESHOLD_MIN
|
|
|
|
#define DEFAULT_MMAP_THRESHOLD_MIN (128 * 1024)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef DEFAULT_MMAP_THRESHOLD_MAX
|
2006-08-22 06:19:12 +00:00
|
|
|
/* For 32-bit platforms we cannot increase the maximum mmap
|
|
|
|
threshold much because it is also the minimum value for the
|
2006-08-22 06:42:35 +00:00
|
|
|
maximum heap size and its alignment. Going above 512k (i.e., 1M
|
|
|
|
for new heaps) wastes too much address space. */
|
2006-08-22 06:19:12 +00:00
|
|
|
# if __WORDSIZE == 32
|
2006-08-22 06:42:35 +00:00
|
|
|
# define DEFAULT_MMAP_THRESHOLD_MAX (512 * 1024)
|
2006-08-22 06:19:12 +00:00
|
|
|
# else
|
2006-08-22 06:42:35 +00:00
|
|
|
# define DEFAULT_MMAP_THRESHOLD_MAX (4 * 1024 * 1024 * sizeof(long))
|
2006-08-22 06:19:12 +00:00
|
|
|
# endif
|
2006-08-09 21:51:56 +00:00
|
|
|
#endif
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
M_MMAP_THRESHOLD is the request size threshold for using mmap()
|
|
|
|
to service a request. Requests of at least this size that cannot
|
|
|
|
be allocated using already-existing space will be serviced via mmap.
|
|
|
|
(If enough normal freed space already exists it is used instead.)
|
|
|
|
|
|
|
|
Using mmap segregates relatively large chunks of memory so that
|
|
|
|
they can be individually obtained and released from the host
|
|
|
|
system. A request serviced through mmap is never reused by any
|
|
|
|
other request (at least not directly; the system may just so
|
|
|
|
happen to remap successive requests to the same locations).
|
|
|
|
|
|
|
|
Segregating space in this way has the benefits that:
|
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
1. Mmapped space can ALWAYS be individually released back
|
|
|
|
to the system, which helps keep the system level memory
|
|
|
|
demands of a long-lived program low.
|
2002-01-29 07:54:51 +00:00
|
|
|
2. Mapped memory can never become `locked' between
|
|
|
|
other chunks, as can happen with normally allocated chunks, which
|
|
|
|
means that even trimming via malloc_trim would not release them.
|
|
|
|
3. On some systems with "holes" in address spaces, mmap can obtain
|
|
|
|
memory that sbrk cannot.
|
|
|
|
|
|
|
|
However, it has the disadvantages that:
|
|
|
|
|
|
|
|
1. The space cannot be reclaimed, consolidated, and then
|
|
|
|
used to service later requests, as happens with normal chunks.
|
|
|
|
2. It can lead to more wastage because of mmap page alignment
|
|
|
|
requirements
|
|
|
|
3. It causes malloc performance to be more dependent on host
|
|
|
|
system memory management support routines which may vary in
|
|
|
|
implementation quality and may impose arbitrary
|
|
|
|
limitations. Generally, servicing a request via normal
|
|
|
|
malloc steps is faster than going through a system's mmap.
|
|
|
|
|
|
|
|
The advantages of mmap nearly always outweigh disadvantages for
|
|
|
|
"large" chunks, but the value of "large" varies across systems. The
|
|
|
|
default is an empirically derived value that works well in most
|
|
|
|
systems.
|
2006-08-09 21:51:56 +00:00
|
|
|
|
|
|
|
|
|
|
|
Update in 2006:
|
|
|
|
The above was written in 2001. Since then the world has changed a lot.
|
|
|
|
Memory got bigger. Applications got bigger. The virtual address space
|
|
|
|
layout in 32 bit linux changed.
|
|
|
|
|
|
|
|
In the new situation, brk() and mmap space is shared and there are no
|
|
|
|
artificial limits on brk size imposed by the kernel. What is more,
|
|
|
|
applications have started using transient allocations larger than the
|
|
|
|
128Kb as was imagined in 2001.
|
|
|
|
|
|
|
|
The price for mmap is also high now; each time glibc mmaps from the
|
|
|
|
kernel, the kernel is forced to zero out the memory it gives to the
|
|
|
|
application. Zeroing memory is expensive and eats a lot of cache and
|
|
|
|
memory bandwidth. This has nothing to do with the efficiency of the
|
|
|
|
virtual memory system, by doing mmap the kernel just has no choice but
|
|
|
|
to zero.
|
|
|
|
|
|
|
|
In 2001, the kernel had a maximum size for brk() which was about 800
|
|
|
|
megabytes on 32 bit x86, at that point brk() would hit the first
|
|
|
|
mmaped shared libaries and couldn't expand anymore. With current 2.6
|
|
|
|
kernels, the VA space layout is different and brk() and mmap
|
|
|
|
both can span the entire heap at will.
|
|
|
|
|
|
|
|
Rather than using a static threshold for the brk/mmap tradeoff,
|
|
|
|
we are now using a simple dynamic one. The goal is still to avoid
|
|
|
|
fragmentation. The old goals we kept are
|
|
|
|
1) try to get the long lived large allocations to use mmap()
|
|
|
|
2) really large allocations should always use mmap()
|
|
|
|
and we're adding now:
|
|
|
|
3) transient allocations should use brk() to avoid forcing the kernel
|
|
|
|
having to zero memory over and over again
|
|
|
|
|
|
|
|
The implementation works with a sliding threshold, which is by default
|
|
|
|
limited to go between 128Kb and 32Mb (64Mb for 64 bitmachines) and starts
|
|
|
|
out at 128Kb as per the 2001 default.
|
|
|
|
|
|
|
|
This allows us to satisfy requirement 1) under the assumption that long
|
|
|
|
lived allocations are made early in the process' lifespan, before it has
|
|
|
|
started doing dynamic allocations of the same size (which will
|
|
|
|
increase the threshold).
|
|
|
|
|
|
|
|
The upperbound on the threshold satisfies requirement 2)
|
|
|
|
|
|
|
|
The threshold goes up in value when the application frees memory that was
|
|
|
|
allocated with the mmap allocator. The idea is that once the application
|
|
|
|
starts freeing memory of a certain size, it's highly probable that this is
|
|
|
|
a size the application uses for transient allocations. This estimator
|
|
|
|
is there to satisfy the new third requirement.
|
|
|
|
|
1996-12-08 08:01:13 +00:00
|
|
|
*/
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#define M_MMAP_THRESHOLD -3
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#ifndef DEFAULT_MMAP_THRESHOLD
|
2006-08-09 21:51:56 +00:00
|
|
|
#define DEFAULT_MMAP_THRESHOLD DEFAULT_MMAP_THRESHOLD_MIN
|
2002-01-29 07:54:51 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
M_MMAP_MAX is the maximum number of requests to simultaneously
|
|
|
|
service using mmap. This parameter exists because
|
|
|
|
some systems have a limited number of internal tables for
|
|
|
|
use by mmap, and using more than a few of them may degrade
|
|
|
|
performance.
|
|
|
|
|
|
|
|
The default is set to a value that serves only as a safeguard.
|
2011-09-10 22:10:17 +00:00
|
|
|
Setting to 0 disables use of mmap for servicing large requests.
|
2002-01-29 07:54:51 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#define M_MMAP_MAX -4
|
|
|
|
|
|
|
|
#ifndef DEFAULT_MMAP_MAX
|
|
|
|
#define DEFAULT_MMAP_MAX (65536)
|
1996-12-08 08:01:13 +00:00
|
|
|
#endif
|
|
|
|
|
Update.
* stdio-common/itowa-digits.c (_itowa_lower_digits): Define as hidden.
(_itowa_upper_digits): Likewise.
* libio/stdio.c (_IO_stdin, _IO_stdout, _IO_stderr): Define as hidden.
* libio/libio.h [_LIBC] (_IO_stdin, _IO_stdout, _IO_stderr): Declare
as hidden.
* libio/libioP.h: Declare _IO_file_jumps_mmap, _IO_wfile_jumps,
_IO_wfile_jumps_mmap, _IO_proc_jumps, _IO_old_proc_jumps,
_IO_str_jumps, _IO_wstr_jumps, _IO_file_jumps_internal,
_IO_wfile_jumps_internal, and _IO_list_all_internal as hidden.
* gmon/gmon.c (__bb_head): Define as hidden.
* gmon/bb_exit_func.c (__bb_head): Declare as hidden.
* argp/argp-parse.c (_argp_hang): Define as static.
* include/libc-symbols.h (_INTVARDEF): Adjust for visibility
handling in latest compilers.
* inet/in6_addr.c (in6addr_any): Use INTVARDEF not INTDEF to
define alias.
* libio/fileops.c (_IO_file_jumps): Likewise.
* libio/stdfiles.c (_IO_list_all): Likewise.
* libio/wfileops.c (_IO_wfile_jumps): Likewise.
* malloc/malloc.h: Move __libc_malloc_initialized declaration to
include/malloc.h.
* include/malloc.h: Add __libc_malloc_initialized declaration
here. Mark variable hidden.
* malloc/malloc.c: Include <malloc.h> not "malloc.h".
* elf/dl-open.c (__libc_argc): Declare as hidden.
(__libc_argv): Likewise.
* sysdeps/generic/wordexp.c (__libc_argc): Declare as hidden.
(__libc_argv): Likewise.
* sysdeps/mach/hurd/i386/init-first.c: Define __libc_argc and
__libc_argv as hidden.
* sysdeps/mach/hurd/mips/init-first.c: Likewise.
* sysdeps/mach/hurd/powerpc/init-first.c: Likewise.
* sysdeps/unix/sysv/aix/init-first.c: Likewise.
* sysdeps/unix/sysv/linux/init-first.c: Likewise.
2002-03-13 02:17:12 +00:00
|
|
|
#include <malloc.h>
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#ifndef RETURN_ADDRESS
|
|
|
|
#define RETURN_ADDRESS(X_) (NULL)
|
1999-07-07 15:33:09 +00:00
|
|
|
#endif
|
1999-05-17 10:09:50 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Forward declarations. */
|
|
|
|
struct malloc_chunk;
|
|
|
|
typedef struct malloc_chunk* mchunkptr;
|
1999-05-17 10:09:50 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Internal routines. */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2011-09-10 22:10:17 +00:00
|
|
|
static void* _int_malloc(mstate, size_t);
|
2009-03-13 23:53:18 +00:00
|
|
|
static void _int_free(mstate, mchunkptr, int);
|
2011-09-10 22:10:17 +00:00
|
|
|
static void* _int_realloc(mstate, mchunkptr, INTERNAL_SIZE_T,
|
2012-01-18 00:21:09 +00:00
|
|
|
INTERNAL_SIZE_T);
|
2011-09-10 22:10:17 +00:00
|
|
|
static void* _int_memalign(mstate, size_t, size_t);
|
2013-11-20 14:46:02 +00:00
|
|
|
static void* _mid_memalign(size_t, size_t, void *);
|
|
|
|
|
2017-08-30 17:29:38 +00:00
|
|
|
static void malloc_printerr(const char *str) __attribute__ ((noreturn));
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2017-08-31 13:56:21 +00:00
|
|
|
static void* mem2mem_check(void *p, size_t sz);
|
|
|
|
static void top_check(void);
|
|
|
|
static void munmap_chunk(mchunkptr p);
|
2002-02-07 05:30:48 +00:00
|
|
|
#if HAVE_MREMAP
|
2017-08-31 13:56:21 +00:00
|
|
|
static mchunkptr mremap_chunk(mchunkptr p, size_t new_size);
|
2002-02-07 05:30:48 +00:00
|
|
|
#endif
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2011-09-10 22:10:17 +00:00
|
|
|
static void* malloc_check(size_t sz, const void *caller);
|
|
|
|
static void free_check(void* mem, const void *caller);
|
|
|
|
static void* realloc_check(void* oldmem, size_t bytes,
|
|
|
|
const void *caller);
|
|
|
|
static void* memalign_check(size_t alignment, size_t bytes,
|
|
|
|
const void *caller);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* ------------------ MMAP support ------------------ */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#include <fcntl.h>
|
|
|
|
#include <sys/mman.h>
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
|
|
|
|
# define MAP_ANONYMOUS MAP_ANON
|
|
|
|
#endif
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#ifndef MAP_NORESERVE
|
2012-01-31 23:49:22 +00:00
|
|
|
# define MAP_NORESERVE 0
|
1996-12-08 08:01:13 +00:00
|
|
|
#endif
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#define MMAP(addr, size, prot, flags) \
|
2012-01-31 23:49:22 +00:00
|
|
|
__mmap((addr), (size), (prot), (flags)|MAP_ANONYMOUS|MAP_PRIVATE, -1, 0)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
2002-01-29 07:54:51 +00:00
|
|
|
----------------------- Chunk representations -----------------------
|
1996-12-08 08:01:13 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
This struct declaration is misleading (but accurate and necessary).
|
|
|
|
It declares a "view" into memory allowing access to necessary
|
|
|
|
fields at known offsets from a given base. See explanation below.
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct malloc_chunk {
|
|
|
|
|
2016-10-28 14:26:57 +00:00
|
|
|
INTERNAL_SIZE_T mchunk_prev_size; /* Size of previous chunk (if free). */
|
|
|
|
INTERNAL_SIZE_T mchunk_size; /* Size in bytes, including overhead. */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
struct malloc_chunk* fd; /* double links -- used only if free. */
|
1996-12-08 08:01:13 +00:00
|
|
|
struct malloc_chunk* bk;
|
2007-04-30 22:18:46 +00:00
|
|
|
|
|
|
|
/* Only used for large blocks: pointer to next larger size. */
|
|
|
|
struct malloc_chunk* fd_nextsize; /* double links -- used only if free. */
|
|
|
|
struct malloc_chunk* bk_nextsize;
|
1996-12-08 08:01:13 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
malloc_chunk details:
|
|
|
|
|
|
|
|
(The following includes lightly edited explanations by Colin Plumb.)
|
|
|
|
|
|
|
|
Chunks of memory are maintained using a `boundary tag' method as
|
|
|
|
described in e.g., Knuth or Standish. (See the paper by Paul
|
|
|
|
Wilson ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps for a
|
|
|
|
survey of such techniques.) Sizes of free chunks are stored both
|
|
|
|
in the front of each chunk and at the end. This makes
|
|
|
|
consolidating fragmented chunks into bigger chunks very fast. The
|
|
|
|
size fields also hold bits representing whether chunks are free or
|
|
|
|
in use.
|
|
|
|
|
|
|
|
An allocated chunk looks like this:
|
|
|
|
|
|
|
|
|
|
|
|
chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
2016-10-28 20:36:58 +00:00
|
|
|
| Size of previous chunk, if unallocated (P clear) |
|
2009-08-31 11:55:10 +00:00
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
2016-10-28 20:36:58 +00:00
|
|
|
| Size of chunk, in bytes |A|M|P|
|
1996-12-08 08:01:13 +00:00
|
|
|
mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
2009-08-31 11:55:10 +00:00
|
|
|
| User data starts here... .
|
|
|
|
. .
|
|
|
|
. (malloc_usable_size() bytes) .
|
|
|
|
. |
|
1996-12-08 08:01:13 +00:00
|
|
|
nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
2016-10-28 20:36:58 +00:00
|
|
|
| (size of chunk, but used for application data) |
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
| Size of next chunk, in bytes |A|0|1|
|
2009-08-31 11:55:10 +00:00
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
Where "chunk" is the front of the chunk for the purpose of most of
|
|
|
|
the malloc code, but "mem" is the pointer that is returned to the
|
|
|
|
user. "Nextchunk" is the beginning of the next contiguous chunk.
|
|
|
|
|
2013-08-29 07:08:54 +00:00
|
|
|
Chunks always begin on even word boundaries, so the mem portion
|
1996-12-08 08:01:13 +00:00
|
|
|
(which is returned to the user) is also on an even word boundary, and
|
2002-01-29 07:54:51 +00:00
|
|
|
thus at least double-word aligned.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
Free chunks are stored in circular doubly-linked lists, and look like this:
|
|
|
|
|
|
|
|
chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
2016-10-28 20:36:58 +00:00
|
|
|
| Size of previous chunk, if unallocated (P clear) |
|
2009-08-31 11:55:10 +00:00
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
2016-10-28 20:36:58 +00:00
|
|
|
`head:' | Size of chunk, in bytes |A|0|P|
|
1996-12-08 08:01:13 +00:00
|
|
|
mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
2009-08-31 11:55:10 +00:00
|
|
|
| Forward pointer to next chunk in list |
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
| Back pointer to previous chunk in list |
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
| Unused space (may be 0 bytes long) .
|
|
|
|
. .
|
|
|
|
. |
|
1996-12-08 08:01:13 +00:00
|
|
|
nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
`foot:' | Size of chunk, in bytes |
|
2009-08-31 11:55:10 +00:00
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
2016-10-28 20:36:58 +00:00
|
|
|
| Size of next chunk, in bytes |A|0|0|
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
The P (PREV_INUSE) bit, stored in the unused low-order bit of the
|
|
|
|
chunk size (which is always a multiple of two words), is an in-use
|
|
|
|
bit for the *previous* chunk. If that bit is *clear*, then the
|
|
|
|
word before the current chunk size contains the previous chunk
|
|
|
|
size, and can be used to find the front of the previous chunk.
|
2002-01-29 07:54:51 +00:00
|
|
|
The very first chunk allocated always has this bit set,
|
|
|
|
preventing access to non-existent (or non-owned) memory. If
|
|
|
|
prev_inuse is set for any given chunk, then you CANNOT determine
|
|
|
|
the size of the previous chunk, and might even get a memory
|
|
|
|
addressing fault when trying to do so.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2016-10-28 20:36:58 +00:00
|
|
|
The A (NON_MAIN_ARENA) bit is cleared for chunks on the initial,
|
|
|
|
main arena, described by the main_arena variable. When additional
|
|
|
|
threads are spawned, each thread receives its own arena (up to a
|
|
|
|
configurable limit, after which arenas are reused for multiple
|
|
|
|
threads), and the chunks in these arenas have the A bit set. To
|
|
|
|
find the arena for a chunk on such a non-main arena, heap_for_ptr
|
|
|
|
performs a bit mask operation and indirection through the ar_ptr
|
|
|
|
member of the per-heap header heap_info (see arena.c).
|
|
|
|
|
1996-12-08 08:01:13 +00:00
|
|
|
Note that the `foot' of the current chunk is actually represented
|
2002-01-29 07:54:51 +00:00
|
|
|
as the prev_size of the NEXT chunk. This makes it easier to
|
|
|
|
deal with alignments etc but can be very confusing when trying
|
|
|
|
to extend or adapt this code.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2016-10-28 20:36:58 +00:00
|
|
|
The three exceptions to all this are:
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
1. The special chunk `top' doesn't bother using the
|
2009-08-31 11:55:10 +00:00
|
|
|
trailing size field since there is no next contiguous chunk
|
|
|
|
that would have to index off it. After initialization, `top'
|
|
|
|
is forced to always exist. If it would become less than
|
|
|
|
MINSIZE bytes long, it is replenished.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
2. Chunks allocated via mmap, which have the second-lowest-order
|
2009-08-31 11:55:10 +00:00
|
|
|
bit M (IS_MMAPPED) set in their size fields. Because they are
|
2016-10-28 20:36:58 +00:00
|
|
|
allocated one-by-one, each must contain its own trailing size
|
|
|
|
field. If the M bit is set, the other bits are ignored
|
|
|
|
(because mmapped chunks are neither in an arena, nor adjacent
|
|
|
|
to a freed chunk). The M bit is also used for chunks which
|
|
|
|
originally came from a dumped heap via malloc_set_state in
|
|
|
|
hooks.c.
|
|
|
|
|
|
|
|
3. Chunks in fastbins are treated as allocated chunks from the
|
|
|
|
point of view of the chunk allocator. They are consolidated
|
|
|
|
with their neighbors only in bulk, in malloc_consolidate.
|
1996-12-08 08:01:13 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
2002-01-29 07:54:51 +00:00
|
|
|
---------- Size and alignment checks and conversions ----------
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2020-12-21 15:03:03 +00:00
|
|
|
/* Conversion from malloc headers to user pointers, and back. When
|
|
|
|
using memory tagging the user data and the malloc data structure
|
|
|
|
headers have distinct tags. Converting fully from one to the other
|
|
|
|
involves extracting the tag at the other address and creating a
|
|
|
|
suitable pointer using it. That can be quite expensive. There are
|
2021-03-09 14:04:49 +00:00
|
|
|
cases when the pointers are not dereferenced (for example only used
|
|
|
|
for alignment check) so the tags are not relevant, and there are
|
|
|
|
cases when user data is not tagged distinctly from malloc headers
|
|
|
|
(user data is untagged because tagging is done late in malloc and
|
|
|
|
early in free). User memory tagging across internal interfaces:
|
|
|
|
|
|
|
|
sysmalloc: Returns untagged memory.
|
|
|
|
_int_malloc: Returns untagged memory.
|
|
|
|
_int_free: Takes untagged memory.
|
|
|
|
_int_memalign: Returns untagged memory.
|
|
|
|
_int_memalign: Returns untagged memory.
|
|
|
|
_mid_memalign: Returns tagged memory.
|
|
|
|
_int_realloc: Takes and returns tagged memory.
|
|
|
|
*/
|
2020-12-21 15:03:03 +00:00
|
|
|
|
|
|
|
/* The chunk header is two SIZE_SZ elements, but this is used widely, so
|
|
|
|
we define it here for clarity later. */
|
|
|
|
#define CHUNK_HDR_SZ (2 * SIZE_SZ)
|
|
|
|
|
2021-03-09 14:04:49 +00:00
|
|
|
/* Convert a chunk address to a user mem pointer without correcting
|
2020-12-21 15:03:03 +00:00
|
|
|
the tag. */
|
2021-03-11 14:49:45 +00:00
|
|
|
#define chunk2mem(p) ((void*)((char*)(p) + CHUNK_HDR_SZ))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2021-03-11 14:49:45 +00:00
|
|
|
/* Convert a chunk address to a user mem pointer and extract the right tag. */
|
|
|
|
#define chunk2mem_tag(p) ((void*)tag_at ((char*)(p) + CHUNK_HDR_SZ))
|
|
|
|
|
|
|
|
/* Convert a user mem pointer to a chunk address and extract the right tag. */
|
2021-02-16 14:12:25 +00:00
|
|
|
#define mem2chunk(mem) ((mchunkptr)tag_at (((char*)(mem) - CHUNK_HDR_SZ)))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* The smallest possible chunk */
|
2007-04-30 22:18:46 +00:00
|
|
|
#define MIN_CHUNK_SIZE (offsetof(struct malloc_chunk, fd_nextsize))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* The smallest size we can malloc is an aligned minimal chunk */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#define MINSIZE \
|
|
|
|
(unsigned long)(((MIN_CHUNK_SIZE+MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Check if m has acceptable alignment */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2006-03-02 15:53:19 +00:00
|
|
|
#define aligned_OK(m) (((unsigned long)(m) & MALLOC_ALIGN_MASK) == 0)
|
|
|
|
|
|
|
|
#define misaligned_chunk(p) \
|
2021-03-11 14:49:45 +00:00
|
|
|
((uintptr_t)(MALLOC_ALIGNMENT == CHUNK_HDR_SZ ? (p) : chunk2mem (p)) \
|
2006-03-02 15:53:19 +00:00
|
|
|
& MALLOC_ALIGN_MASK)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* pad request bytes into a usable size -- internal version */
|
2020-12-21 15:03:03 +00:00
|
|
|
/* Note: This must be a macro that evaluates to a compile time constant
|
|
|
|
if passed a literal constant. */
|
2002-01-29 07:54:51 +00:00
|
|
|
#define request2size(req) \
|
|
|
|
(((req) + SIZE_SZ + MALLOC_ALIGN_MASK < MINSIZE) ? \
|
|
|
|
MINSIZE : \
|
|
|
|
((req) + SIZE_SZ + MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
/* Check if REQ overflows when padded and aligned and if the resulting value
|
|
|
|
is less than PTRDIFF_T. Returns TRUE and the requested size or MINSIZE in
|
|
|
|
case the value is less than MINSIZE on SZ or false if any of the previous
|
|
|
|
check fail. */
|
|
|
|
static inline bool
|
|
|
|
checked_request2size (size_t req, size_t *sz) __nonnull (1)
|
|
|
|
{
|
|
|
|
if (__glibc_unlikely (req > PTRDIFF_MAX))
|
|
|
|
return false;
|
2020-12-21 15:03:03 +00:00
|
|
|
|
|
|
|
/* When using tagged memory, we cannot share the end of the user
|
|
|
|
block with the header for the next chunk, so ensure that we
|
|
|
|
allocate blocks that are rounded up to the granule size. Take
|
|
|
|
care not to overflow from close to MAX_SIZE_T to a small
|
|
|
|
number. Ideally, this would be part of request2size(), but that
|
|
|
|
must be a macro that produces a compile time constant if passed
|
|
|
|
a constant literal. */
|
2021-02-08 12:39:01 +00:00
|
|
|
if (__glibc_unlikely (mtag_enabled))
|
2021-03-15 11:44:32 +00:00
|
|
|
{
|
|
|
|
/* Ensure this is not evaluated if !mtag_enabled, see gcc PR 99551. */
|
|
|
|
asm ("");
|
|
|
|
|
|
|
|
req = (req + (__MTAG_GRANULE_SIZE - 1)) &
|
|
|
|
~(size_t)(__MTAG_GRANULE_SIZE - 1);
|
|
|
|
}
|
2020-12-21 15:03:03 +00:00
|
|
|
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
*sz = request2size (req);
|
|
|
|
return true;
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
--------------- Physical chunk operations ---------------
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* size field is or'ed with PREV_INUSE when previous adjacent chunk in use */
|
|
|
|
#define PREV_INUSE 0x1
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* extract inuse bit of previous chunk */
|
2016-10-28 14:26:57 +00:00
|
|
|
#define prev_inuse(p) ((p)->mchunk_size & PREV_INUSE)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* size field is or'ed with IS_MMAPPED if the chunk was obtained with mmap() */
|
|
|
|
#define IS_MMAPPED 0x2
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* check for mmap()'ed chunk */
|
2016-10-28 14:26:57 +00:00
|
|
|
#define chunk_is_mmapped(p) ((p)->mchunk_size & IS_MMAPPED)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* size field is or'ed with NON_MAIN_ARENA if the chunk was obtained
|
|
|
|
from a non-main arena. This is only set immediately before handing
|
|
|
|
the chunk to the user, if necessary. */
|
|
|
|
#define NON_MAIN_ARENA 0x4
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2016-10-28 20:36:58 +00:00
|
|
|
/* Check for chunk from main arena. */
|
2016-10-28 14:26:57 +00:00
|
|
|
#define chunk_main_arena(p) (((p)->mchunk_size & NON_MAIN_ARENA) == 0)
|
|
|
|
|
|
|
|
/* Mark a chunk as not being on the main arena. */
|
|
|
|
#define set_non_main_arena(p) ((p)->mchunk_size |= NON_MAIN_ARENA)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Bits to mask off when extracting size
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
Note: IS_MMAPPED is intentionally not masked off from size field in
|
|
|
|
macros for which mmapped chunks should never be seen. This should
|
|
|
|
cause helpful core dumps to occur if it is tried by accident by
|
|
|
|
people extending or adapting this malloc.
|
|
|
|
*/
|
|
|
|
#define SIZE_BITS (PREV_INUSE | IS_MMAPPED | NON_MAIN_ARENA)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Get size, ignoring use bits */
|
2016-10-28 14:26:57 +00:00
|
|
|
#define chunksize(p) (chunksize_nomask (p) & ~(SIZE_BITS))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2016-10-28 14:26:57 +00:00
|
|
|
/* Like chunksize, but do not mask SIZE_BITS. */
|
|
|
|
#define chunksize_nomask(p) ((p)->mchunk_size)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Ptr to next physical malloc_chunk. */
|
2016-10-28 14:26:57 +00:00
|
|
|
#define next_chunk(p) ((mchunkptr) (((char *) (p)) + chunksize (p)))
|
|
|
|
|
2018-03-09 15:21:22 +00:00
|
|
|
/* Size of the chunk below P. Only valid if !prev_inuse (P). */
|
2016-10-28 14:26:57 +00:00
|
|
|
#define prev_size(p) ((p)->mchunk_prev_size)
|
|
|
|
|
2018-03-09 15:21:22 +00:00
|
|
|
/* Set the size of the chunk below P. Only valid if !prev_inuse (P). */
|
2016-10-28 14:26:57 +00:00
|
|
|
#define set_prev_size(p, sz) ((p)->mchunk_prev_size = (sz))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2018-03-09 15:21:22 +00:00
|
|
|
/* Ptr to previous physical malloc_chunk. Only valid if !prev_inuse (P). */
|
2016-10-28 14:26:57 +00:00
|
|
|
#define prev_chunk(p) ((mchunkptr) (((char *) (p)) - prev_size (p)))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Treat space at ptr + offset as a chunk */
|
2014-01-02 08:38:18 +00:00
|
|
|
#define chunk_at_offset(p, s) ((mchunkptr) (((char *) (p)) + (s)))
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/* extract p's inuse bit */
|
2014-01-02 08:38:18 +00:00
|
|
|
#define inuse(p) \
|
2016-10-28 14:26:57 +00:00
|
|
|
((((mchunkptr) (((char *) (p)) + chunksize (p)))->mchunk_size) & PREV_INUSE)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* set/clear chunk as being inuse without otherwise disturbing */
|
2014-01-02 08:38:18 +00:00
|
|
|
#define set_inuse(p) \
|
2016-10-28 14:26:57 +00:00
|
|
|
((mchunkptr) (((char *) (p)) + chunksize (p)))->mchunk_size |= PREV_INUSE
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
#define clear_inuse(p) \
|
2016-10-28 14:26:57 +00:00
|
|
|
((mchunkptr) (((char *) (p)) + chunksize (p)))->mchunk_size &= ~(PREV_INUSE)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* check/set/clear inuse bits in known places */
|
2014-01-02 08:38:18 +00:00
|
|
|
#define inuse_bit_at_offset(p, s) \
|
2016-10-28 14:26:57 +00:00
|
|
|
(((mchunkptr) (((char *) (p)) + (s)))->mchunk_size & PREV_INUSE)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
#define set_inuse_bit_at_offset(p, s) \
|
2016-10-28 14:26:57 +00:00
|
|
|
(((mchunkptr) (((char *) (p)) + (s)))->mchunk_size |= PREV_INUSE)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
#define clear_inuse_bit_at_offset(p, s) \
|
2016-10-28 14:26:57 +00:00
|
|
|
(((mchunkptr) (((char *) (p)) + (s)))->mchunk_size &= ~(PREV_INUSE))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Set size at head, without disturbing its use bit */
|
2016-10-28 14:26:57 +00:00
|
|
|
#define set_head_size(p, s) ((p)->mchunk_size = (((p)->mchunk_size & SIZE_BITS) | (s)))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Set size/use field */
|
2016-10-28 14:26:57 +00:00
|
|
|
#define set_head(p, s) ((p)->mchunk_size = (s))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Set size at footer (only when chunk is not in use) */
|
2016-10-28 14:26:57 +00:00
|
|
|
#define set_foot(p, s) (((mchunkptr) ((char *) (p) + (s)))->mchunk_prev_size = (s))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2016-10-28 14:26:57 +00:00
|
|
|
#pragma GCC poison mchunk_size
|
|
|
|
#pragma GCC poison mchunk_prev_size
|
|
|
|
|
2021-03-08 12:59:05 +00:00
|
|
|
/* This is the size of the real usable data in the chunk. Not valid for
|
|
|
|
dumped heap chunks. */
|
|
|
|
#define memsize(p) \
|
|
|
|
(__MTAG_GRANULE_SIZE > SIZE_SZ && __glibc_unlikely (mtag_enabled) ? \
|
|
|
|
chunksize (p) - CHUNK_HDR_SZ : \
|
|
|
|
chunksize (p) - CHUNK_HDR_SZ + (chunk_is_mmapped (p) ? 0 : SIZE_SZ))
|
|
|
|
|
|
|
|
/* If memory tagging is enabled the layout changes to accomodate the granule
|
|
|
|
size, this is wasteful for small allocations so not done by default.
|
|
|
|
Both the chunk header and user data has to be granule aligned. */
|
|
|
|
_Static_assert (__MTAG_GRANULE_SIZE <= CHUNK_HDR_SZ,
|
|
|
|
"memory tagging is not supported with large granule.");
|
|
|
|
|
2021-01-27 15:45:43 +00:00
|
|
|
static __always_inline void *
|
|
|
|
tag_new_usable (void *ptr)
|
|
|
|
{
|
|
|
|
if (__glibc_unlikely (mtag_enabled) && ptr)
|
|
|
|
{
|
|
|
|
mchunkptr cp = mem2chunk(ptr);
|
2021-03-08 12:59:05 +00:00
|
|
|
ptr = __libc_mtag_tag_region (__libc_mtag_new_tag (ptr), memsize (cp));
|
2021-01-27 15:45:43 +00:00
|
|
|
}
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
-------------------- Internal data structures --------------------
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
All internal state is held in an instance of malloc_state defined
|
|
|
|
below. There are no other static variables, except in two optional
|
2002-02-07 05:30:48 +00:00
|
|
|
cases:
|
2014-01-02 08:38:18 +00:00
|
|
|
* If USE_MALLOC_LOCK is defined, the mALLOC_MUTEx declared above.
|
|
|
|
* If mmap doesn't support MAP_ANONYMOUS, a dummy file descriptor
|
2011-09-10 22:10:17 +00:00
|
|
|
for mmap.
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
Beware of lots of tricks that minimize the total bookkeeping space
|
|
|
|
requirements. The result is a little over 1K bytes (for 4byte
|
|
|
|
pointers and size_t.)
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Bins
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
An array of bin headers for free chunks. Each bin is doubly
|
|
|
|
linked. The bins are approximately proportionally (log) spaced.
|
|
|
|
There are a lot of these bins (128). This may look excessive, but
|
|
|
|
works very well in practice. Most bins hold sizes that are
|
|
|
|
unusual as malloc request sizes, but are more usual for fragments
|
|
|
|
and consolidated sets of chunks, which is what these bins hold, so
|
|
|
|
they can be found quickly. All procedures maintain the invariant
|
|
|
|
that no consolidated chunk physically borders another one, so each
|
|
|
|
chunk in a list is known to be preceeded and followed by either
|
|
|
|
inuse chunks or the ends of memory.
|
|
|
|
|
|
|
|
Chunks in bins are kept in size order, with ties going to the
|
|
|
|
approximately least recently used chunk. Ordering isn't needed
|
|
|
|
for the small bins, which all contain the same-sized chunks, but
|
|
|
|
facilitates best-fit allocation for larger chunks. These lists
|
|
|
|
are just sequential. Keeping them in order almost never requires
|
|
|
|
enough traversal to warrant using fancier ordered data
|
2002-02-07 05:30:48 +00:00
|
|
|
structures.
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
Chunks of the same size are linked with the most
|
|
|
|
recently freed at the front, and allocations are taken from the
|
|
|
|
back. This results in LRU (FIFO) allocation order, which tends
|
|
|
|
to give each chunk an equal opportunity to be consolidated with
|
|
|
|
adjacent freed chunks, resulting in larger free chunks and less
|
|
|
|
fragmentation.
|
|
|
|
|
|
|
|
To simplify use in double-linked lists, each bin header acts
|
|
|
|
as a malloc_chunk. This avoids special-casing for headers.
|
|
|
|
But to conserve space and improve locality, we allocate
|
|
|
|
only the fd/bk pointers of bins, and then use repositioning tricks
|
2002-02-07 05:30:48 +00:00
|
|
|
to treat these as the fields of a malloc_chunk*.
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
typedef struct malloc_chunk *mbinptr;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* addressing -- note that bin_at(0) does not exist */
|
2006-08-27 04:38:05 +00:00
|
|
|
#define bin_at(m, i) \
|
|
|
|
(mbinptr) (((char *) &((m)->bins[((i) - 1) * 2])) \
|
2014-01-02 08:38:18 +00:00
|
|
|
- offsetof (struct malloc_chunk, fd))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* analog of ++bin */
|
2014-01-02 08:38:18 +00:00
|
|
|
#define next_bin(b) ((mbinptr) ((char *) (b) + (sizeof (mchunkptr) << 1)))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Reminders about list directionality within bins */
|
|
|
|
#define first(b) ((b)->fd)
|
|
|
|
#define last(b) ((b)->bk)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Indexing
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
Bins for sizes < 512 bytes contain chunks of all the same size, spaced
|
|
|
|
8 bytes apart. Larger bins are approximately logarithmically spaced:
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
64 bins of size 8
|
|
|
|
32 bins of size 64
|
|
|
|
16 bins of size 512
|
|
|
|
8 bins of size 4096
|
|
|
|
4 bins of size 32768
|
|
|
|
2 bins of size 262144
|
|
|
|
1 bin of size what's left
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
There is actually a little bit of slop in the numbers in bin_index
|
|
|
|
for the sake of speed. This makes no difference elsewhere.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
The bins top out around 1MB because we expect to service large
|
|
|
|
requests via mmap.
|
2012-05-24 18:57:23 +00:00
|
|
|
|
|
|
|
Bin 0 does not exist. Bin 1 is the unordered list; if that would be
|
|
|
|
a valid chunk size the small bins are bumped up one.
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#define NBINS 128
|
|
|
|
#define NSMALLBINS 64
|
2007-05-15 01:51:37 +00:00
|
|
|
#define SMALLBIN_WIDTH MALLOC_ALIGNMENT
|
2020-12-21 15:03:03 +00:00
|
|
|
#define SMALLBIN_CORRECTION (MALLOC_ALIGNMENT > CHUNK_HDR_SZ)
|
2012-05-24 18:57:23 +00:00
|
|
|
#define MIN_LARGE_SIZE ((NSMALLBINS - SMALLBIN_CORRECTION) * SMALLBIN_WIDTH)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#define in_smallbin_range(sz) \
|
2014-01-02 08:38:18 +00:00
|
|
|
((unsigned long) (sz) < (unsigned long) MIN_LARGE_SIZE)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2007-05-15 01:51:37 +00:00
|
|
|
#define smallbin_index(sz) \
|
2014-01-02 08:38:18 +00:00
|
|
|
((SMALLBIN_WIDTH == 16 ? (((unsigned) (sz)) >> 4) : (((unsigned) (sz)) >> 3))\
|
2012-05-24 18:57:23 +00:00
|
|
|
+ SMALLBIN_CORRECTION)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2007-05-15 01:51:37 +00:00
|
|
|
#define largebin_index_32(sz) \
|
2014-01-02 08:38:18 +00:00
|
|
|
(((((unsigned long) (sz)) >> 6) <= 38) ? 56 + (((unsigned long) (sz)) >> 6) :\
|
|
|
|
((((unsigned long) (sz)) >> 9) <= 20) ? 91 + (((unsigned long) (sz)) >> 9) :\
|
|
|
|
((((unsigned long) (sz)) >> 12) <= 10) ? 110 + (((unsigned long) (sz)) >> 12) :\
|
|
|
|
((((unsigned long) (sz)) >> 15) <= 4) ? 119 + (((unsigned long) (sz)) >> 15) :\
|
|
|
|
((((unsigned long) (sz)) >> 18) <= 2) ? 124 + (((unsigned long) (sz)) >> 18) :\
|
|
|
|
126)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2012-05-24 18:57:23 +00:00
|
|
|
#define largebin_index_32_big(sz) \
|
2014-01-02 08:38:18 +00:00
|
|
|
(((((unsigned long) (sz)) >> 6) <= 45) ? 49 + (((unsigned long) (sz)) >> 6) :\
|
|
|
|
((((unsigned long) (sz)) >> 9) <= 20) ? 91 + (((unsigned long) (sz)) >> 9) :\
|
|
|
|
((((unsigned long) (sz)) >> 12) <= 10) ? 110 + (((unsigned long) (sz)) >> 12) :\
|
|
|
|
((((unsigned long) (sz)) >> 15) <= 4) ? 119 + (((unsigned long) (sz)) >> 15) :\
|
|
|
|
((((unsigned long) (sz)) >> 18) <= 2) ? 124 + (((unsigned long) (sz)) >> 18) :\
|
|
|
|
126)
|
2012-05-24 18:57:23 +00:00
|
|
|
|
2007-05-15 01:51:37 +00:00
|
|
|
// XXX It remains to be seen whether it is good to keep the widths of
|
|
|
|
// XXX the buckets the same or whether it should be scaled by a factor
|
|
|
|
// XXX of two as well.
|
|
|
|
#define largebin_index_64(sz) \
|
2014-01-02 08:38:18 +00:00
|
|
|
(((((unsigned long) (sz)) >> 6) <= 48) ? 48 + (((unsigned long) (sz)) >> 6) :\
|
|
|
|
((((unsigned long) (sz)) >> 9) <= 20) ? 91 + (((unsigned long) (sz)) >> 9) :\
|
|
|
|
((((unsigned long) (sz)) >> 12) <= 10) ? 110 + (((unsigned long) (sz)) >> 12) :\
|
|
|
|
((((unsigned long) (sz)) >> 15) <= 4) ? 119 + (((unsigned long) (sz)) >> 15) :\
|
|
|
|
((((unsigned long) (sz)) >> 18) <= 2) ? 124 + (((unsigned long) (sz)) >> 18) :\
|
|
|
|
126)
|
2007-05-15 01:51:37 +00:00
|
|
|
|
|
|
|
#define largebin_index(sz) \
|
2012-05-24 18:57:23 +00:00
|
|
|
(SIZE_SZ == 8 ? largebin_index_64 (sz) \
|
|
|
|
: MALLOC_ALIGNMENT == 16 ? largebin_index_32_big (sz) \
|
|
|
|
: largebin_index_32 (sz))
|
2007-05-15 01:51:37 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#define bin_index(sz) \
|
2014-01-02 08:38:18 +00:00
|
|
|
((in_smallbin_range (sz)) ? smallbin_index (sz) : largebin_index (sz))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2018-11-12 13:15:14 +00:00
|
|
|
/* Take a chunk off a bin list. */
|
|
|
|
static void
|
|
|
|
unlink_chunk (mstate av, mchunkptr p)
|
|
|
|
{
|
|
|
|
if (chunksize (p) != prev_size (next_chunk (p)))
|
|
|
|
malloc_printerr ("corrupted size vs. prev_size");
|
|
|
|
|
|
|
|
mchunkptr fd = p->fd;
|
|
|
|
mchunkptr bk = p->bk;
|
|
|
|
|
|
|
|
if (__builtin_expect (fd->bk != p || bk->fd != p, 0))
|
|
|
|
malloc_printerr ("corrupted double-linked list");
|
|
|
|
|
|
|
|
fd->bk = bk;
|
|
|
|
bk->fd = fd;
|
|
|
|
if (!in_smallbin_range (chunksize_nomask (p)) && p->fd_nextsize != NULL)
|
|
|
|
{
|
|
|
|
if (p->fd_nextsize->bk_nextsize != p
|
|
|
|
|| p->bk_nextsize->fd_nextsize != p)
|
|
|
|
malloc_printerr ("corrupted double-linked list (not small)");
|
|
|
|
|
|
|
|
if (fd->fd_nextsize == NULL)
|
|
|
|
{
|
|
|
|
if (p->fd_nextsize == p)
|
|
|
|
fd->fd_nextsize = fd->bk_nextsize = fd;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fd->fd_nextsize = p->fd_nextsize;
|
|
|
|
fd->bk_nextsize = p->bk_nextsize;
|
|
|
|
p->fd_nextsize->bk_nextsize = fd;
|
|
|
|
p->bk_nextsize->fd_nextsize = fd;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
p->fd_nextsize->bk_nextsize = p->bk_nextsize;
|
|
|
|
p->bk_nextsize->fd_nextsize = p->fd_nextsize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Unsorted chunks
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
All remainders from chunk splits, as well as all returned chunks,
|
|
|
|
are first placed in the "unsorted" bin. They are then placed
|
|
|
|
in regular bins after malloc gives them ONE chance to be used before
|
|
|
|
binning. So, basically, the unsorted_chunks list acts as a queue,
|
|
|
|
with chunks being placed on it in free (and malloc_consolidate),
|
|
|
|
and taken off (to be either used or placed in bins) in malloc.
|
|
|
|
|
|
|
|
The NON_MAIN_ARENA flag is never set for unsorted chunks, so it
|
|
|
|
does not have to be taken into account in size comparisons.
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* The otherwise unindexable 1-bin is used to hold unsorted chunks. */
|
2014-01-02 08:38:18 +00:00
|
|
|
#define unsorted_chunks(M) (bin_at (M, 1))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Top
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
The top-most available chunk (i.e., the one bordering the end of
|
|
|
|
available memory) is treated specially. It is never included in
|
|
|
|
any bin, is used only if no other chunk is available, and is
|
|
|
|
released back to the system if it is very large (see
|
|
|
|
M_TRIM_THRESHOLD). Because top initially
|
|
|
|
points to its own bin with initial zero size, thus forcing
|
|
|
|
extension on the first malloc request, we avoid having any special
|
|
|
|
code in malloc to check whether it even exists yet. But we still
|
|
|
|
need to do so when getting memory from system, so we make
|
|
|
|
initial_top treat the bin as a legal but unusable chunk during the
|
|
|
|
interval between initialization and the first call to
|
2012-01-31 23:49:22 +00:00
|
|
|
sysmalloc. (This is somewhat delicate, since it relies on
|
2002-01-29 07:54:51 +00:00
|
|
|
the 2 preceding words to be zero during this interval as well.)
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Conveniently, the unsorted bin can be used as dummy top on first call */
|
2014-01-02 08:38:18 +00:00
|
|
|
#define initial_top(M) (unsorted_chunks (M))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Binmap
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
To help compensate for the large number of bins, a one-level index
|
|
|
|
structure is used for bin-by-bin searching. `binmap' is a
|
|
|
|
bitvector recording whether bins are definitely empty so they can
|
|
|
|
be skipped over during during traversals. The bits are NOT always
|
|
|
|
cleared as soon as bins are empty, but instead only
|
|
|
|
when they are noticed to be empty during traversal in malloc.
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Conservatively use 32 bits per map word, even if on 64bit system */
|
|
|
|
#define BINMAPSHIFT 5
|
|
|
|
#define BITSPERMAP (1U << BINMAPSHIFT)
|
|
|
|
#define BINMAPSIZE (NBINS / BITSPERMAP)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#define idx2block(i) ((i) >> BINMAPSHIFT)
|
2014-01-02 08:38:18 +00:00
|
|
|
#define idx2bit(i) ((1U << ((i) & ((1U << BINMAPSHIFT) - 1))))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
#define mark_bin(m, i) ((m)->binmap[idx2block (i)] |= idx2bit (i))
|
|
|
|
#define unmark_bin(m, i) ((m)->binmap[idx2block (i)] &= ~(idx2bit (i)))
|
|
|
|
#define get_binmap(m, i) ((m)->binmap[idx2block (i)] & idx2bit (i))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Fastbins
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
An array of lists holding recently freed small chunks. Fastbins
|
|
|
|
are not doubly linked. It is faster to single-link them, and
|
|
|
|
since chunks are never removed from the middles of these lists,
|
|
|
|
double linking is not necessary. Also, unlike regular bins, they
|
|
|
|
are not even processed in FIFO order (they use faster LIFO) since
|
|
|
|
ordering doesn't much matter in the transient contexts in which
|
|
|
|
fastbins are normally used.
|
|
|
|
|
|
|
|
Chunks in fastbins keep their inuse bit set, so they cannot
|
|
|
|
be consolidated with other free chunks. malloc_consolidate
|
|
|
|
releases all chunks in fastbins and consolidates them with
|
2002-02-07 05:30:48 +00:00
|
|
|
other free chunks.
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
typedef struct malloc_chunk *mfastbinptr;
|
2009-03-13 23:53:18 +00:00
|
|
|
#define fastbin(ar_ptr, idx) ((ar_ptr)->fastbinsY[idx])
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* offset 2 to use otherwise unindexable first 2 bins */
|
2009-03-13 23:53:18 +00:00
|
|
|
#define fastbin_index(sz) \
|
2014-01-02 08:38:18 +00:00
|
|
|
((((unsigned int) (sz)) >> (SIZE_SZ == 8 ? 4 : 3)) - 2)
|
2009-03-13 23:53:18 +00:00
|
|
|
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* The maximum fastbin request size we support */
|
2009-03-13 23:53:18 +00:00
|
|
|
#define MAX_FAST_SIZE (80 * SIZE_SZ / 4)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
#define NFASTBINS (fastbin_index (request2size (MAX_FAST_SIZE)) + 1)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
FASTBIN_CONSOLIDATION_THRESHOLD is the size of a chunk in free()
|
|
|
|
that triggers automatic consolidation of possibly-surrounding
|
|
|
|
fastbin chunks. This is a heuristic, so the exact value should not
|
|
|
|
matter too much. It is defined at half the default trim threshold as a
|
|
|
|
compromise heuristic to only attempt consolidation if it is likely
|
|
|
|
to lead to trimming. However, it is not dynamically tunable, since
|
|
|
|
consolidation reduces fragmentation surrounding large chunks even
|
|
|
|
if trimming is not used.
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#define FASTBIN_CONSOLIDATION_THRESHOLD (65536UL)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
NONCONTIGUOUS_BIT indicates that MORECORE does not return contiguous
|
|
|
|
regions. Otherwise, contiguity is exploited in merging together,
|
|
|
|
when possible, results from consecutive MORECORE calls.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
The initial value comes from MORECORE_CONTIGUOUS, but is
|
|
|
|
changed dynamically if mmap is ever used as an sbrk substitute.
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#define NONCONTIGUOUS_BIT (2U)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
#define contiguous(M) (((M)->flags & NONCONTIGUOUS_BIT) == 0)
|
|
|
|
#define noncontiguous(M) (((M)->flags & NONCONTIGUOUS_BIT) != 0)
|
|
|
|
#define set_noncontiguous(M) ((M)->flags |= NONCONTIGUOUS_BIT)
|
2005-10-12 20:18:07 +00:00
|
|
|
#define set_contiguous(M) ((M)->flags &= ~NONCONTIGUOUS_BIT)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-08-10 13:58:28 +00:00
|
|
|
/* Maximum size of memory handled in fastbins. */
|
|
|
|
static INTERNAL_SIZE_T global_max_fast;
|
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
/*
|
|
|
|
Set value of max_fast.
|
2002-01-29 07:54:51 +00:00
|
|
|
Use impossibly small value if 0.
|
2017-10-17 17:55:16 +00:00
|
|
|
Precondition: there are no existing fastbin chunks in the main arena.
|
|
|
|
Since do_check_malloc_state () checks this, we call malloc_consolidate ()
|
|
|
|
before changing max_fast. Note other arenas will leak their fast bin
|
|
|
|
entries if max_fast is reduced.
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2005-10-12 20:18:07 +00:00
|
|
|
#define set_max_fast(s) \
|
2020-04-04 05:44:56 +00:00
|
|
|
global_max_fast = (((size_t) (s) <= MALLOC_ALIGN_MASK - SIZE_SZ) \
|
2019-10-30 22:03:14 +00:00
|
|
|
? MIN_CHUNK_SIZE / 2 : ((s + SIZE_SZ) & ~MALLOC_ALIGN_MASK))
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-08-10 13:58:28 +00:00
|
|
|
static inline INTERNAL_SIZE_T
|
|
|
|
get_max_fast (void)
|
|
|
|
{
|
|
|
|
/* Tell the GCC optimizers that global_max_fast is never larger
|
|
|
|
than MAX_FAST_SIZE. This avoids out-of-bounds array accesses in
|
|
|
|
_int_malloc after constant propagation of the size parameter.
|
|
|
|
(The code never executes because malloc preserves the
|
|
|
|
global_max_fast invariant, but the optimizers may not recognize
|
|
|
|
this.) */
|
|
|
|
if (global_max_fast > MAX_FAST_SIZE)
|
|
|
|
__builtin_unreachable ();
|
|
|
|
return global_max_fast;
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
2002-01-29 07:54:51 +00:00
|
|
|
----------- Internal state representation and initialization -----------
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-10-17 17:43:31 +00:00
|
|
|
/*
|
|
|
|
have_fastchunks indicates that there are probably some fastbin chunks.
|
|
|
|
It is set true on entering a chunk into any fastbin, and cleared early in
|
|
|
|
malloc_consolidate. The value is approximate since it may be set when there
|
|
|
|
are no fastbin chunks, or it may be clear even if there are fastbin chunks
|
|
|
|
available. Given it's sole purpose is to reduce number of redundant calls to
|
|
|
|
malloc_consolidate, it does not affect correctness. As a result we can safely
|
|
|
|
use relaxed atomic accesses.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
struct malloc_state
|
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Serialize access. */
|
2016-09-21 14:28:08 +00:00
|
|
|
__libc_lock_define (, mutex);
|
2005-10-12 20:18:07 +00:00
|
|
|
|
|
|
|
/* Flags (formerly in max_fast). */
|
|
|
|
int flags;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-10-17 17:43:31 +00:00
|
|
|
/* Set if the fastbin chunks contain recently inserted free blocks. */
|
2017-10-18 11:20:55 +00:00
|
|
|
/* Note this is a bool but not all targets support atomics on booleans. */
|
|
|
|
int have_fastchunks;
|
2017-10-17 17:43:31 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Fastbins */
|
2014-01-02 08:38:18 +00:00
|
|
|
mfastbinptr fastbinsY[NFASTBINS];
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Base of the topmost chunk -- not otherwise kept in a bin */
|
2014-01-02 08:38:18 +00:00
|
|
|
mchunkptr top;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* The remainder from the most recent split of a small request */
|
2014-01-02 08:38:18 +00:00
|
|
|
mchunkptr last_remainder;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Normal bins packed as described above */
|
2014-01-02 08:38:18 +00:00
|
|
|
mchunkptr bins[NBINS * 2 - 2];
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Bitmap of bins */
|
2014-01-02 08:38:18 +00:00
|
|
|
unsigned int binmap[BINMAPSIZE];
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Linked list */
|
|
|
|
struct malloc_state *next;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2015-10-28 18:32:46 +00:00
|
|
|
/* Linked list for free arenas. Access to this field is serialized
|
2015-12-21 15:42:46 +00:00
|
|
|
by free_list_lock in arena.c. */
|
2009-03-13 23:53:18 +00:00
|
|
|
struct malloc_state *next_free;
|
|
|
|
|
2015-10-28 18:32:46 +00:00
|
|
|
/* Number of threads attached to this arena. 0 if the arena is on
|
2015-12-21 15:42:46 +00:00
|
|
|
the free list. Access to this field is serialized by
|
|
|
|
free_list_lock in arena.c. */
|
2015-10-28 18:32:46 +00:00
|
|
|
INTERNAL_SIZE_T attached_threads;
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Memory allocated from the system in this arena. */
|
|
|
|
INTERNAL_SIZE_T system_mem;
|
|
|
|
INTERNAL_SIZE_T max_system_mem;
|
|
|
|
};
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
struct malloc_par
|
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Tunable parameters */
|
2014-01-02 08:38:18 +00:00
|
|
|
unsigned long trim_threshold;
|
|
|
|
INTERNAL_SIZE_T top_pad;
|
|
|
|
INTERNAL_SIZE_T mmap_threshold;
|
|
|
|
INTERNAL_SIZE_T arena_test;
|
|
|
|
INTERNAL_SIZE_T arena_max;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/* Memory map support */
|
2014-01-02 08:38:18 +00:00
|
|
|
int n_mmaps;
|
|
|
|
int n_mmaps_max;
|
|
|
|
int max_n_mmaps;
|
2006-08-09 21:51:56 +00:00
|
|
|
/* the mmap_threshold is dynamic, until the user sets
|
|
|
|
it manually, at which point we need to disable any
|
|
|
|
dynamic behavior. */
|
2014-01-02 08:38:18 +00:00
|
|
|
int no_dyn_threshold;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/* Statistics */
|
2014-01-02 08:38:18 +00:00
|
|
|
INTERNAL_SIZE_T mmapped_mem;
|
|
|
|
INTERNAL_SIZE_T max_mmapped_mem;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/* First address handed out by MORECORE/sbrk. */
|
2014-01-02 08:38:18 +00:00
|
|
|
char *sbrk_base;
|
2017-07-06 17:37:30 +00:00
|
|
|
|
|
|
|
#if USE_TCACHE
|
|
|
|
/* Maximum number of buckets to use. */
|
|
|
|
size_t tcache_bins;
|
|
|
|
size_t tcache_max_bytes;
|
|
|
|
/* Maximum number of chunks in each bucket. */
|
|
|
|
size_t tcache_count;
|
|
|
|
/* Maximum number of chunks to remove from the unsorted list, which
|
|
|
|
aren't used to prefill the cache. */
|
|
|
|
size_t tcache_unsorted_limit;
|
|
|
|
#endif
|
2002-01-29 07:54:51 +00:00
|
|
|
};
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* There are several instances of this struct ("arenas") in this
|
|
|
|
malloc. If you are adapting this malloc in a way that does NOT use
|
|
|
|
a static or mmapped malloc_state, you MUST explicitly zero-fill it
|
|
|
|
before using. This malloc relies on the property that malloc_state
|
|
|
|
is initialized to all zeroes (as is true of C statics). */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2011-09-11 01:47:36 +00:00
|
|
|
static struct malloc_state main_arena =
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
2015-11-24 15:37:15 +00:00
|
|
|
.mutex = _LIBC_LOCK_INITIALIZER,
|
2015-10-28 18:32:46 +00:00
|
|
|
.next = &main_arena,
|
|
|
|
.attached_threads = 1
|
2014-01-02 08:38:18 +00:00
|
|
|
};
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2016-05-13 12:16:39 +00:00
|
|
|
/* These variables are used for undumping support. Chunked are marked
|
|
|
|
as using mmap, but we leave them alone if they fall into this
|
2016-06-08 18:50:21 +00:00
|
|
|
range. NB: The chunk size for these chunks only includes the
|
|
|
|
initial size field (of SIZE_SZ bytes), there is no trailing size
|
|
|
|
field (unlike with regular mmapped chunks). */
|
2016-05-13 12:16:39 +00:00
|
|
|
static mchunkptr dumped_main_arena_start; /* Inclusive. */
|
|
|
|
static mchunkptr dumped_main_arena_end; /* Exclusive. */
|
|
|
|
|
|
|
|
/* True if the pointer falls into the dumped arena. Use this after
|
|
|
|
chunk_is_mmapped indicates a chunk is mmapped. */
|
|
|
|
#define DUMPED_MAIN_ARENA_CHUNK(p) \
|
|
|
|
((p) >= dumped_main_arena_start && (p) < dumped_main_arena_end)
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* There is only one instance of the malloc parameters. */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2011-09-11 01:47:36 +00:00
|
|
|
static struct malloc_par mp_ =
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
.top_pad = DEFAULT_TOP_PAD,
|
|
|
|
.n_mmaps_max = DEFAULT_MMAP_MAX,
|
|
|
|
.mmap_threshold = DEFAULT_MMAP_THRESHOLD,
|
|
|
|
.trim_threshold = DEFAULT_TRIM_THRESHOLD,
|
|
|
|
#define NARENAS_FROM_NCORES(n) ((n) * (sizeof (long) == 4 ? 2 : 8))
|
|
|
|
.arena_test = NARENAS_FROM_NCORES (1)
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
,
|
|
|
|
.tcache_count = TCACHE_FILL_COUNT,
|
|
|
|
.tcache_bins = TCACHE_MAX_BINS,
|
|
|
|
.tcache_max_bytes = tidx2usize (TCACHE_MAX_BINS-1),
|
|
|
|
.tcache_unsorted_limit = 0 /* No limit. */
|
|
|
|
#endif
|
2014-01-02 08:38:18 +00:00
|
|
|
};
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Initialize a malloc_state struct.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
This is called from ptmalloc_init () or from _int_new_arena ()
|
|
|
|
when creating a new arena.
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static void
|
|
|
|
malloc_init_state (mstate av)
|
2002-01-29 07:54:51 +00:00
|
|
|
{
|
2014-01-02 08:38:18 +00:00
|
|
|
int i;
|
2002-01-29 07:54:51 +00:00
|
|
|
mbinptr bin;
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Establish circular links for normal bins */
|
2014-01-02 08:38:18 +00:00
|
|
|
for (i = 1; i < NBINS; ++i)
|
|
|
|
{
|
|
|
|
bin = bin_at (av, i);
|
|
|
|
bin->fd = bin->bk = bin;
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#if MORECORE_CONTIGUOUS
|
|
|
|
if (av != &main_arena)
|
|
|
|
#endif
|
2014-01-02 08:38:18 +00:00
|
|
|
set_noncontiguous (av);
|
2005-10-12 20:18:07 +00:00
|
|
|
if (av == &main_arena)
|
2014-01-02 08:38:18 +00:00
|
|
|
set_max_fast (DEFAULT_MXFAST);
|
2017-10-17 17:43:31 +00:00
|
|
|
atomic_store_relaxed (&av->have_fastchunks, false);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
av->top = initial_top (av);
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1999-12-10 04:37:40 +00:00
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
/*
|
2002-01-29 07:54:51 +00:00
|
|
|
Other internal utilities operating on mstates
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static void *sysmalloc (INTERNAL_SIZE_T, mstate);
|
|
|
|
static int systrim (size_t, mstate);
|
|
|
|
static void malloc_consolidate (mstate);
|
update from main archive 961220
Sat Dec 21 04:14:16 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/common/pause.c: Add missing second argument in
call to __sigpause.
Reported by a sun <asun@zoology.washington.edu>.
* locale/weight.h: Correct handling of collation elements.
Reported by Keld Simonsen <keld@dkuug.dk>.
* manual/time.texi: Document ^ flag and %P format.
* new-malloc/malloc.c: Update from Wolfram Gloger.
* nss/nss.h: Reformat copyright.
* posix/sched.h: Likewise.
* sysdeps/i386/fpu_control.h: Likewise.
* sysdeps/unix/sysv/linux/fcntlbits.h: Likewise.
* sysdeps/unix/sysv/linux/ioctls.h: Likewise.
* sysdeps/unix/sysv/linux/sigcontext.h: Likewise.
* sysdeps/unix/sysv/linux/utsnamelen.h: Likewise.
* sysdeps/unix/sysv/linux/sys/acct.h: Likewise.
* sysvips/sys/msg.h: Likewise.
* stdio-common/Makefile (routines): Remove fcloseall.
* stdio-common/fcloseall.c: Removed.
* stdlib/Makefile (distribute): Add abort-instr.h.
* sysdeps/generic/abort-instr.h: New file.
* sysdeps/i386/abort-instr.h: New file.
* sysdeps/generic/abort.c: Use lock and stage counter to prevent
any form of loop.
* sysdeps/unix/sysv/linux/timebits.h: Define CLK_TCK as 100.
* sysdeps/unix/sysv/linux/alpha/timebits.h: Define CLOCKS_PER_SEC
as 1000000. Define CLK_TCK as 1024.
* time/time.c (CLK_TCK): Define only if not already set.
* time/strftime.c: Don't use `isdigit' when computing field width
from string since the locale might have more than one digit
block.
Fri Dec 20 12:38:14 1996 Darrel Hankerson <hankedr@mail.auburn.edu>
* posix/getopt.c (in -W option handling): Return when optind == argc.
Thu Dec 19 14:24:50 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* nis/nss_nis/nis-alias.c (_nss_nis_parse_aliasent): Add const to
type of KEY.
* nis/nss_compat/compat-grp.c: Include the declaration of the file
parser.
* nis/nss_compat/compat-pwd.c: Likewise.
* nis/nss_compat/compat-spwd.c: Likewise.
* nis/nss_nis/nis-ethers.c: Likewise.
* nis/nss_nis/nis-grp.c: Likewise.
* nis/nss_nis/nis-network.c: Likewise.
* nis/nss_nis/nis-proto.c: Likewise.
* nis/nss_nis/nis-pwd.c: Likewise.
* nis/nss_nis/nis-rpc.c: Likewise.
* nis/nss_nis/nis-spwd.c: Likewise.
* nis/nss_compat/compat-grp.c (getgrent_next_nis,
getgrent_next_file): Pass the correct type for the buffer to the
parser function.
* nis/nss_compat/compat-pwd.c (getpwent_next_netgr,
getpwent_next_nis, getpwent_next_file): Likewise.
* nis/nss_compat/compat-spwd.c (getspent_next_netgr,
getspent_next_nis, getspent_next_file): Likewise.
* nis/nss_nis/nis-ethers.c (internal_nis_getetherent_r,
_nss_nis_getethernam_r, _nss_nis_getetherbyaddr_r): Likewise.
* nis/nss_nis/nis-grp.c (internal_nis_getgrent_r,
_nss_nis_getgrnam_r, _nss_nis_getgrgid_r): Likewise.
* nis/nss_nis/nis-network.c (internal_nis_getnetent_r,
_nss_nis_getnetbyname_r, _nss_nis_getnetbyaddr_r): Likewise.
* nis/nss_nis/nis-proto.c (internal_nis_getprotoent_r,
_nss_nis_getprotobyname_r, _nss_nis_getprotobynumber_r): Likewise.
* nis/nss_nis/nis-pwd.c (internal_nis_getpwent_r,
_nss_nis_getpwnam_r, _nss_nis_getpwuid_r): Likewise.
* nis/nss_nis/nis-rpc.c (internal_nis_getrpcent_r,
_nss_nis_getrpcbynumber_r): Likewise.
* nis/nss_nis/nis-spwd.c (internal_nis_getspent_r,
_nss_nis_getspnam_r): Likewise.
Thu Dec 19 13:37:16 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/setjmp.c: New file.
1996-12-21 04:13:58 +00:00
|
|
|
|
2002-08-23 10:53:52 +00:00
|
|
|
|
|
|
|
/* -------------- Early definitions for debugging hooks ---------------- */
|
|
|
|
|
|
|
|
/* Define and initialize the hook variables. These weak definitions must
|
|
|
|
appear before any use of the variables in a function (arena.c uses one). */
|
|
|
|
#ifndef weak_variable
|
|
|
|
/* In GNU libc we want the hook variables to be weak definitions to
|
|
|
|
avoid a problem with Emacs. */
|
2011-09-10 22:10:17 +00:00
|
|
|
# define weak_variable weak_function
|
2002-08-23 10:53:52 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Forward declarations. */
|
2014-01-02 08:38:18 +00:00
|
|
|
static void *malloc_hook_ini (size_t sz,
|
|
|
|
const void *caller) __THROW;
|
|
|
|
static void *realloc_hook_ini (void *ptr, size_t sz,
|
|
|
|
const void *caller) __THROW;
|
|
|
|
static void *memalign_hook_ini (size_t alignment, size_t sz,
|
|
|
|
const void *caller) __THROW;
|
2002-08-23 10:53:52 +00:00
|
|
|
|
2016-06-10 08:46:05 +00:00
|
|
|
#if HAVE_MALLOC_INIT_HOOK
|
2021-03-25 10:05:37 +00:00
|
|
|
void (*__malloc_initialize_hook) (void) __attribute__ ((nocommon));
|
2016-06-20 09:11:29 +00:00
|
|
|
compat_symbol (libc, __malloc_initialize_hook,
|
|
|
|
__malloc_initialize_hook, GLIBC_2_0);
|
2016-06-10 08:46:05 +00:00
|
|
|
#endif
|
|
|
|
|
2013-03-08 21:27:42 +00:00
|
|
|
void weak_variable (*__free_hook) (void *__ptr,
|
2014-01-02 08:38:18 +00:00
|
|
|
const void *) = NULL;
|
2013-03-08 21:27:42 +00:00
|
|
|
void *weak_variable (*__malloc_hook)
|
2014-01-02 08:38:18 +00:00
|
|
|
(size_t __size, const void *) = malloc_hook_ini;
|
2013-03-08 21:27:42 +00:00
|
|
|
void *weak_variable (*__realloc_hook)
|
2014-01-02 08:38:18 +00:00
|
|
|
(void *__ptr, size_t __size, const void *)
|
|
|
|
= realloc_hook_ini;
|
2013-03-08 21:27:42 +00:00
|
|
|
void *weak_variable (*__memalign_hook)
|
2014-01-02 08:38:18 +00:00
|
|
|
(size_t __alignment, size_t __size, const void *)
|
|
|
|
= memalign_hook_ini;
|
2004-09-08 08:12:39 +00:00
|
|
|
void weak_variable (*__after_morecore_hook) (void) = NULL;
|
2002-08-23 10:53:52 +00:00
|
|
|
|
2017-11-23 13:47:31 +00:00
|
|
|
/* This function is called from the arena shutdown hook, to free the
|
|
|
|
thread cache (if it exists). */
|
|
|
|
static void tcache_thread_shutdown (void);
|
2002-08-23 10:53:52 +00:00
|
|
|
|
2005-03-08 00:50:21 +00:00
|
|
|
/* ------------------ Testing support ----------------------------------*/
|
|
|
|
|
|
|
|
static int perturb_byte;
|
|
|
|
|
2014-12-17 18:41:28 +00:00
|
|
|
static void
|
2013-12-09 16:25:19 +00:00
|
|
|
alloc_perturb (char *p, size_t n)
|
|
|
|
{
|
|
|
|
if (__glibc_unlikely (perturb_byte))
|
|
|
|
memset (p, perturb_byte ^ 0xff, n);
|
|
|
|
}
|
|
|
|
|
2014-12-17 18:41:28 +00:00
|
|
|
static void
|
2013-12-09 16:25:19 +00:00
|
|
|
free_perturb (char *p, size_t n)
|
|
|
|
{
|
|
|
|
if (__glibc_unlikely (perturb_byte))
|
|
|
|
memset (p, perturb_byte, n);
|
|
|
|
}
|
|
|
|
|
2005-03-08 00:50:21 +00:00
|
|
|
|
|
|
|
|
2013-09-20 14:10:54 +00:00
|
|
|
#include <stap-probe.h>
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* ------------------- Support for multiple arenas -------------------- */
|
|
|
|
#include "arena.c"
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Debugging support
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
These routines make a number of assertions about the states
|
|
|
|
of data structures that should be true at all times. If any
|
|
|
|
are not true, it's very likely that a user program has somehow
|
|
|
|
trashed memory. (It's also possible that there is a coding error
|
|
|
|
in malloc. In which case, please report it!)
|
|
|
|
*/
|
1998-05-12 12:22:17 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
#if !MALLOC_DEBUG
|
2001-06-26 03:14:04 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
# define check_chunk(A, P)
|
|
|
|
# define check_free_chunk(A, P)
|
|
|
|
# define check_inuse_chunk(A, P)
|
|
|
|
# define check_remalloced_chunk(A, P, N)
|
|
|
|
# define check_malloced_chunk(A, P, N)
|
|
|
|
# define check_malloc_state(A)
|
2001-06-26 03:14:04 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#else
|
Update.
1997-08-14 03:14 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-minimal.c: Don't use relative #include paths.
(malloc): Don't try to initialize _dl_pagesize, it already is.
(__sigjmp_save, longjmp): Reformat.
* sysdeps/generic/dl-sysdep.c: Implement _dl_show_auxv function to
show content of auxiliary array.
(_dl_sysdep_start): Remember start of auxiliary vector.
* sysdeps/mach/hurd/dl-sysdep.c: (_dl_show_auxv): New dummy function.
* elf/link.h: Add prototype for _dl_show_auxv.
* elf/rtld.c (dl_main): Call _dl_show_auxv if LD_SHOW_AUXV envvar
is present.
* libio/iofdopen.c: Better prepare for use in libstdc++.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofopen.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* manual/creature.texi: Mention _XOPEN_SOURCE_EXTENDED in correct
place.
* manual/math.texi: Add comment to sincos decsription to say it's a
GNU extension.
Fix description of random function.
* posix/fnmatch.h: Recognize Windog by _WINDOWS32 not WIN32.
* posix/glob.c: Likewise. Handle stupid system headers on SunOS.
Add casts for all __alloca calls.
* posix/glob.h: Recognize Windog by _WINDOWS32 not WIN32.
Declare additional GLOB_* constants also if _GNU_SOURCE is defined.
Patches by Paul D. Smith <psmith@BayNetworks.COM>.
* stdio-common/_itoa.c: Don't use relateive #include paths.
* sysdeps/i386/fpu/bits/mathinline.h: Enable optimizations even for
gcc 2.7.
(atan): Loading 1.0 from memory does not pay off.
(asinh): Fix typo.
1997-08-13 09:44 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/stub/accept.c: Use socklen_t where necessary.
* sysdeps/stub/bind.c: Likewise.
* sysdeps/stub/connect.c: Likewise.
* sysdeps/stub/getsockname.c: Likewise.
* sysdeps/stub/getsockopt.c: Likewise.
* sysdeps/stub/recvfrom.c: Likewise.
* sysdeps/stub/sendto.c: Likewise.
* sysdeps/stub/setsockopt.c: Likewise.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* io/ftw.c (object_compare): Avoid memcmp when comparing scalar
types.
1997-08-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (cbrt_test): Add epsilon for long double to
`cbrt (-0.001)'.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/stub/bits/string.h: Fix comment.
1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/Makefile (routines): Remove dl-version.
(dl-routines): Add it here instead. This removes dead code from
libc.so.
1997-08-12 17:17 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/thread-m.h (thread_atfork, thread_atfork_static): New
macros to encapsulate pthread_atfork's functionality.
* malloc/malloc.c (ptmalloc_lock_all, ptmalloc_unlock_all): New
functions, registered via thread_atfork in the initialization
routine or via thread_atfork_static in global scope. This
ensures a consistent state of all locks across fork().
1997-08-11 23:00:32 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/programs/xtmp.c (compare_entry):
Partially undo patch made by Klaus Espenlaub. There
was no xtmp/utmp typo. Added comment to cclarify this.
* login/programs/xtmp.h: Likewise.
* posix/getopt.c: Recognize Windog by _WINDOWS32 not WIN32.
Patch by Paul D. Smith <psmith@BayNetworks.COM>.
1997-08-12 13:51 Ulrich Drepper <drepper@cygnus.com>
* login/getutid.c: Rename to __getutid and make getutid and getutxid
weak aliases.
Patch by ir. Mark M._Kettenis <kettenis@phys.uva.nl>.
1997-08-11 23:55 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
Add bits/mman.h.
1997-08-11 08:51:21 1997 H.J. Lu <hjl@gnu.ai.mit.edu>
* stdlib/fmtmsg.c (fmtmsg): Add static to
__libc_once_define macro.
* libc.map (__progname_full, __progname): Added.
1997-08-04 08:31 H.J. Lu <hjl@gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0
if SIOGIFINDEX is not defined.
(if_indextoname): Initialize "result" to NULL.
(if_nametoindex, if_nameindex): Fix ENOSYS setting.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc ISO C 9x exception handling:
* sysdeps/sparc/fpu/bits/mathdef.h: New file.
* sysdeps/sparc/fpu/fclrexcpt.c: New file.
* sysdeps/sparc/fpu/fegetenv.c: New file.
* sysdeps/sparc/fpu/fegetround.c: New file.
* sysdeps/sparc/fpu/feholdexcpt.c: New file.
* sysdeps/sparc/fpu/fesetenv.c: New file.
* sysdeps/sparc/fpu/fesetround.c: New file.
* sysdeps/sparc/fpu/feupdateenv.c: New file.
* sysdeps/sparc/fpu/fgetexcptflg.c: New file.
* sysdeps/sparc/fpu/fraiseexcpt.c: New file.
* sysdeps/sparc/fpu/fsetexcptflg.c: New file.
* sysdeps/sparc/fpu/ftestexcept.c: New file.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: New file.
* sysdeps/sparc/sparc64/fpu/bits/fenv.h: New file.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc64 merge:
* configure.in: Change up subdirectories, rename sparc8->sparcv8.
* csu/Makefile: Nuke need-nopic-initfini bits. The problem was
that sparc64 ld did not recognize pic relocs at all.
* elf/dl-deps.c: Include <string.h>.
* elf/do-rel.h (elf_dynamic_do_rel): Take reloc address and size
directly instead of the DT names to get them from.
* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): New macro distilled
from ELF_DYNAMIC_DO_REL{,A}. Define a second version that accounts
for the possibility that DT_RELA and DT_JMPPLT overlap, as such is
the case on the Sparc.
* elf/elf.h: Stub out Elf64_Ver*, and make them the same as the
Elf32_Ver* bits. The linker does not even know to differentiate
between the word sizes. Someone should examine this and figure
out what the proper sizes of things should be for 64-bit hosts
before the sparc64 libraries are distributed.
* shlib-versions: Rename sparc64 ld.so to not conflict with sparc32
on the same machine.
Move old sysdeps/sparc contents to sysdeps/sparc/sparc32,
rename sparc8 subdir to sparcv8, move sysdeps/sparc64 content to
sysdeps/sparc/sparc64. Same for sysdeps/unix/sysv/linux/sparc.
* sysdeps/sparc/Implies: Do ieee754 here.
* sysdeps/sparc/configure.in: Move from sparc32/.
* sysdeps/sparc/sparc32/Implies: Do wordsize here.
* sysdeps/sparc/sparc64/Implies: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_load_address):
Use uninitialized .got to find load address instead of AT_BASE, as
the later does not exist when running ld.so directly.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Move from ../.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Clean up PIC support.
* sysdeps/sparc/sparc64/Makefile (sysdep_routines): Add s_finitel
and s_signbitl for stdio.
* sysdeps/sparc/sparc64/configure.in: Remove, we no longer need
nopic_initfini.
* sysdeps/sparc/sparc64/bsd-_setjmp.S: Remove.
* sysdeps/sparc/sparc64/bsd-setjmp.S: Remove.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-_setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add __longjmp alias.
* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Add weak _setjmp
and setjmp entry points.
* sysdeps/sparc/sparc64/dl-machine.h: Finish real implementation.
* sysdeps/sparc/sparc64/elf/crtbegin.S: Add copyright, fix PIC.
* sysdeps/sparc/sparc64/elf/crtend.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h (struct sigaction):
Fix sa_flags size for sparc64; add sa_restorer for kernel.
* sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Fix PIC.
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscall.S: New file.
1997-08-10 18:29:08 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/login.c (login): Check for correct return value of
utmpname.
1997-08-11 16:49 Ulrich Drepper <drepper@cygnus.com>
* time/tzset.c (__tzset_internal): Correctly handle TZ strings
following incorrect old POSIX specs.
Patch by Paul Eggert <eggert@twinsun.com>.
* sysdeps/generic/bits/sigaction.h: Correct comment for SA_RESTART.
* sysdeps/unix/bsd/osf/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/minix/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/sigaction.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/math.texi: Define the macros @mul and @infinity and use
them to format the multiplication and infinity signs.
(FP Comparison Functions): Use @code, not @math, for C code
examples.
* elf/dl-profile.c: Add descriptions and implement reading of
1997-08-14 01:54:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
# define check_chunk(A, P) do_check_chunk (A, P)
|
|
|
|
# define check_free_chunk(A, P) do_check_free_chunk (A, P)
|
|
|
|
# define check_inuse_chunk(A, P) do_check_inuse_chunk (A, P)
|
|
|
|
# define check_remalloced_chunk(A, P, N) do_check_remalloced_chunk (A, P, N)
|
|
|
|
# define check_malloced_chunk(A, P, N) do_check_malloced_chunk (A, P, N)
|
|
|
|
# define check_malloc_state(A) do_check_malloc_state (A)
|
Update.
1997-08-14 03:14 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-minimal.c: Don't use relative #include paths.
(malloc): Don't try to initialize _dl_pagesize, it already is.
(__sigjmp_save, longjmp): Reformat.
* sysdeps/generic/dl-sysdep.c: Implement _dl_show_auxv function to
show content of auxiliary array.
(_dl_sysdep_start): Remember start of auxiliary vector.
* sysdeps/mach/hurd/dl-sysdep.c: (_dl_show_auxv): New dummy function.
* elf/link.h: Add prototype for _dl_show_auxv.
* elf/rtld.c (dl_main): Call _dl_show_auxv if LD_SHOW_AUXV envvar
is present.
* libio/iofdopen.c: Better prepare for use in libstdc++.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofopen.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* manual/creature.texi: Mention _XOPEN_SOURCE_EXTENDED in correct
place.
* manual/math.texi: Add comment to sincos decsription to say it's a
GNU extension.
Fix description of random function.
* posix/fnmatch.h: Recognize Windog by _WINDOWS32 not WIN32.
* posix/glob.c: Likewise. Handle stupid system headers on SunOS.
Add casts for all __alloca calls.
* posix/glob.h: Recognize Windog by _WINDOWS32 not WIN32.
Declare additional GLOB_* constants also if _GNU_SOURCE is defined.
Patches by Paul D. Smith <psmith@BayNetworks.COM>.
* stdio-common/_itoa.c: Don't use relateive #include paths.
* sysdeps/i386/fpu/bits/mathinline.h: Enable optimizations even for
gcc 2.7.
(atan): Loading 1.0 from memory does not pay off.
(asinh): Fix typo.
1997-08-13 09:44 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/stub/accept.c: Use socklen_t where necessary.
* sysdeps/stub/bind.c: Likewise.
* sysdeps/stub/connect.c: Likewise.
* sysdeps/stub/getsockname.c: Likewise.
* sysdeps/stub/getsockopt.c: Likewise.
* sysdeps/stub/recvfrom.c: Likewise.
* sysdeps/stub/sendto.c: Likewise.
* sysdeps/stub/setsockopt.c: Likewise.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* io/ftw.c (object_compare): Avoid memcmp when comparing scalar
types.
1997-08-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (cbrt_test): Add epsilon for long double to
`cbrt (-0.001)'.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/stub/bits/string.h: Fix comment.
1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/Makefile (routines): Remove dl-version.
(dl-routines): Add it here instead. This removes dead code from
libc.so.
1997-08-12 17:17 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/thread-m.h (thread_atfork, thread_atfork_static): New
macros to encapsulate pthread_atfork's functionality.
* malloc/malloc.c (ptmalloc_lock_all, ptmalloc_unlock_all): New
functions, registered via thread_atfork in the initialization
routine or via thread_atfork_static in global scope. This
ensures a consistent state of all locks across fork().
1997-08-11 23:00:32 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/programs/xtmp.c (compare_entry):
Partially undo patch made by Klaus Espenlaub. There
was no xtmp/utmp typo. Added comment to cclarify this.
* login/programs/xtmp.h: Likewise.
* posix/getopt.c: Recognize Windog by _WINDOWS32 not WIN32.
Patch by Paul D. Smith <psmith@BayNetworks.COM>.
1997-08-12 13:51 Ulrich Drepper <drepper@cygnus.com>
* login/getutid.c: Rename to __getutid and make getutid and getutxid
weak aliases.
Patch by ir. Mark M._Kettenis <kettenis@phys.uva.nl>.
1997-08-11 23:55 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
Add bits/mman.h.
1997-08-11 08:51:21 1997 H.J. Lu <hjl@gnu.ai.mit.edu>
* stdlib/fmtmsg.c (fmtmsg): Add static to
__libc_once_define macro.
* libc.map (__progname_full, __progname): Added.
1997-08-04 08:31 H.J. Lu <hjl@gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0
if SIOGIFINDEX is not defined.
(if_indextoname): Initialize "result" to NULL.
(if_nametoindex, if_nameindex): Fix ENOSYS setting.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc ISO C 9x exception handling:
* sysdeps/sparc/fpu/bits/mathdef.h: New file.
* sysdeps/sparc/fpu/fclrexcpt.c: New file.
* sysdeps/sparc/fpu/fegetenv.c: New file.
* sysdeps/sparc/fpu/fegetround.c: New file.
* sysdeps/sparc/fpu/feholdexcpt.c: New file.
* sysdeps/sparc/fpu/fesetenv.c: New file.
* sysdeps/sparc/fpu/fesetround.c: New file.
* sysdeps/sparc/fpu/feupdateenv.c: New file.
* sysdeps/sparc/fpu/fgetexcptflg.c: New file.
* sysdeps/sparc/fpu/fraiseexcpt.c: New file.
* sysdeps/sparc/fpu/fsetexcptflg.c: New file.
* sysdeps/sparc/fpu/ftestexcept.c: New file.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: New file.
* sysdeps/sparc/sparc64/fpu/bits/fenv.h: New file.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc64 merge:
* configure.in: Change up subdirectories, rename sparc8->sparcv8.
* csu/Makefile: Nuke need-nopic-initfini bits. The problem was
that sparc64 ld did not recognize pic relocs at all.
* elf/dl-deps.c: Include <string.h>.
* elf/do-rel.h (elf_dynamic_do_rel): Take reloc address and size
directly instead of the DT names to get them from.
* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): New macro distilled
from ELF_DYNAMIC_DO_REL{,A}. Define a second version that accounts
for the possibility that DT_RELA and DT_JMPPLT overlap, as such is
the case on the Sparc.
* elf/elf.h: Stub out Elf64_Ver*, and make them the same as the
Elf32_Ver* bits. The linker does not even know to differentiate
between the word sizes. Someone should examine this and figure
out what the proper sizes of things should be for 64-bit hosts
before the sparc64 libraries are distributed.
* shlib-versions: Rename sparc64 ld.so to not conflict with sparc32
on the same machine.
Move old sysdeps/sparc contents to sysdeps/sparc/sparc32,
rename sparc8 subdir to sparcv8, move sysdeps/sparc64 content to
sysdeps/sparc/sparc64. Same for sysdeps/unix/sysv/linux/sparc.
* sysdeps/sparc/Implies: Do ieee754 here.
* sysdeps/sparc/configure.in: Move from sparc32/.
* sysdeps/sparc/sparc32/Implies: Do wordsize here.
* sysdeps/sparc/sparc64/Implies: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_load_address):
Use uninitialized .got to find load address instead of AT_BASE, as
the later does not exist when running ld.so directly.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Move from ../.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Clean up PIC support.
* sysdeps/sparc/sparc64/Makefile (sysdep_routines): Add s_finitel
and s_signbitl for stdio.
* sysdeps/sparc/sparc64/configure.in: Remove, we no longer need
nopic_initfini.
* sysdeps/sparc/sparc64/bsd-_setjmp.S: Remove.
* sysdeps/sparc/sparc64/bsd-setjmp.S: Remove.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-_setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add __longjmp alias.
* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Add weak _setjmp
and setjmp entry points.
* sysdeps/sparc/sparc64/dl-machine.h: Finish real implementation.
* sysdeps/sparc/sparc64/elf/crtbegin.S: Add copyright, fix PIC.
* sysdeps/sparc/sparc64/elf/crtend.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h (struct sigaction):
Fix sa_flags size for sparc64; add sa_restorer for kernel.
* sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Fix PIC.
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscall.S: New file.
1997-08-10 18:29:08 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/login.c (login): Check for correct return value of
utmpname.
1997-08-11 16:49 Ulrich Drepper <drepper@cygnus.com>
* time/tzset.c (__tzset_internal): Correctly handle TZ strings
following incorrect old POSIX specs.
Patch by Paul Eggert <eggert@twinsun.com>.
* sysdeps/generic/bits/sigaction.h: Correct comment for SA_RESTART.
* sysdeps/unix/bsd/osf/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/minix/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/sigaction.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/math.texi: Define the macros @mul and @infinity and use
them to format the multiplication and infinity signs.
(FP Comparison Functions): Use @code, not @math, for C code
examples.
* elf/dl-profile.c: Add descriptions and implement reading of
1997-08-14 01:54:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Properties of all chunks
|
|
|
|
*/
|
Update.
1997-08-14 03:14 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-minimal.c: Don't use relative #include paths.
(malloc): Don't try to initialize _dl_pagesize, it already is.
(__sigjmp_save, longjmp): Reformat.
* sysdeps/generic/dl-sysdep.c: Implement _dl_show_auxv function to
show content of auxiliary array.
(_dl_sysdep_start): Remember start of auxiliary vector.
* sysdeps/mach/hurd/dl-sysdep.c: (_dl_show_auxv): New dummy function.
* elf/link.h: Add prototype for _dl_show_auxv.
* elf/rtld.c (dl_main): Call _dl_show_auxv if LD_SHOW_AUXV envvar
is present.
* libio/iofdopen.c: Better prepare for use in libstdc++.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofopen.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* manual/creature.texi: Mention _XOPEN_SOURCE_EXTENDED in correct
place.
* manual/math.texi: Add comment to sincos decsription to say it's a
GNU extension.
Fix description of random function.
* posix/fnmatch.h: Recognize Windog by _WINDOWS32 not WIN32.
* posix/glob.c: Likewise. Handle stupid system headers on SunOS.
Add casts for all __alloca calls.
* posix/glob.h: Recognize Windog by _WINDOWS32 not WIN32.
Declare additional GLOB_* constants also if _GNU_SOURCE is defined.
Patches by Paul D. Smith <psmith@BayNetworks.COM>.
* stdio-common/_itoa.c: Don't use relateive #include paths.
* sysdeps/i386/fpu/bits/mathinline.h: Enable optimizations even for
gcc 2.7.
(atan): Loading 1.0 from memory does not pay off.
(asinh): Fix typo.
1997-08-13 09:44 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/stub/accept.c: Use socklen_t where necessary.
* sysdeps/stub/bind.c: Likewise.
* sysdeps/stub/connect.c: Likewise.
* sysdeps/stub/getsockname.c: Likewise.
* sysdeps/stub/getsockopt.c: Likewise.
* sysdeps/stub/recvfrom.c: Likewise.
* sysdeps/stub/sendto.c: Likewise.
* sysdeps/stub/setsockopt.c: Likewise.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* io/ftw.c (object_compare): Avoid memcmp when comparing scalar
types.
1997-08-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (cbrt_test): Add epsilon for long double to
`cbrt (-0.001)'.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/stub/bits/string.h: Fix comment.
1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/Makefile (routines): Remove dl-version.
(dl-routines): Add it here instead. This removes dead code from
libc.so.
1997-08-12 17:17 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/thread-m.h (thread_atfork, thread_atfork_static): New
macros to encapsulate pthread_atfork's functionality.
* malloc/malloc.c (ptmalloc_lock_all, ptmalloc_unlock_all): New
functions, registered via thread_atfork in the initialization
routine or via thread_atfork_static in global scope. This
ensures a consistent state of all locks across fork().
1997-08-11 23:00:32 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/programs/xtmp.c (compare_entry):
Partially undo patch made by Klaus Espenlaub. There
was no xtmp/utmp typo. Added comment to cclarify this.
* login/programs/xtmp.h: Likewise.
* posix/getopt.c: Recognize Windog by _WINDOWS32 not WIN32.
Patch by Paul D. Smith <psmith@BayNetworks.COM>.
1997-08-12 13:51 Ulrich Drepper <drepper@cygnus.com>
* login/getutid.c: Rename to __getutid and make getutid and getutxid
weak aliases.
Patch by ir. Mark M._Kettenis <kettenis@phys.uva.nl>.
1997-08-11 23:55 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
Add bits/mman.h.
1997-08-11 08:51:21 1997 H.J. Lu <hjl@gnu.ai.mit.edu>
* stdlib/fmtmsg.c (fmtmsg): Add static to
__libc_once_define macro.
* libc.map (__progname_full, __progname): Added.
1997-08-04 08:31 H.J. Lu <hjl@gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0
if SIOGIFINDEX is not defined.
(if_indextoname): Initialize "result" to NULL.
(if_nametoindex, if_nameindex): Fix ENOSYS setting.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc ISO C 9x exception handling:
* sysdeps/sparc/fpu/bits/mathdef.h: New file.
* sysdeps/sparc/fpu/fclrexcpt.c: New file.
* sysdeps/sparc/fpu/fegetenv.c: New file.
* sysdeps/sparc/fpu/fegetround.c: New file.
* sysdeps/sparc/fpu/feholdexcpt.c: New file.
* sysdeps/sparc/fpu/fesetenv.c: New file.
* sysdeps/sparc/fpu/fesetround.c: New file.
* sysdeps/sparc/fpu/feupdateenv.c: New file.
* sysdeps/sparc/fpu/fgetexcptflg.c: New file.
* sysdeps/sparc/fpu/fraiseexcpt.c: New file.
* sysdeps/sparc/fpu/fsetexcptflg.c: New file.
* sysdeps/sparc/fpu/ftestexcept.c: New file.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: New file.
* sysdeps/sparc/sparc64/fpu/bits/fenv.h: New file.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc64 merge:
* configure.in: Change up subdirectories, rename sparc8->sparcv8.
* csu/Makefile: Nuke need-nopic-initfini bits. The problem was
that sparc64 ld did not recognize pic relocs at all.
* elf/dl-deps.c: Include <string.h>.
* elf/do-rel.h (elf_dynamic_do_rel): Take reloc address and size
directly instead of the DT names to get them from.
* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): New macro distilled
from ELF_DYNAMIC_DO_REL{,A}. Define a second version that accounts
for the possibility that DT_RELA and DT_JMPPLT overlap, as such is
the case on the Sparc.
* elf/elf.h: Stub out Elf64_Ver*, and make them the same as the
Elf32_Ver* bits. The linker does not even know to differentiate
between the word sizes. Someone should examine this and figure
out what the proper sizes of things should be for 64-bit hosts
before the sparc64 libraries are distributed.
* shlib-versions: Rename sparc64 ld.so to not conflict with sparc32
on the same machine.
Move old sysdeps/sparc contents to sysdeps/sparc/sparc32,
rename sparc8 subdir to sparcv8, move sysdeps/sparc64 content to
sysdeps/sparc/sparc64. Same for sysdeps/unix/sysv/linux/sparc.
* sysdeps/sparc/Implies: Do ieee754 here.
* sysdeps/sparc/configure.in: Move from sparc32/.
* sysdeps/sparc/sparc32/Implies: Do wordsize here.
* sysdeps/sparc/sparc64/Implies: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_load_address):
Use uninitialized .got to find load address instead of AT_BASE, as
the later does not exist when running ld.so directly.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Move from ../.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Clean up PIC support.
* sysdeps/sparc/sparc64/Makefile (sysdep_routines): Add s_finitel
and s_signbitl for stdio.
* sysdeps/sparc/sparc64/configure.in: Remove, we no longer need
nopic_initfini.
* sysdeps/sparc/sparc64/bsd-_setjmp.S: Remove.
* sysdeps/sparc/sparc64/bsd-setjmp.S: Remove.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-_setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add __longjmp alias.
* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Add weak _setjmp
and setjmp entry points.
* sysdeps/sparc/sparc64/dl-machine.h: Finish real implementation.
* sysdeps/sparc/sparc64/elf/crtbegin.S: Add copyright, fix PIC.
* sysdeps/sparc/sparc64/elf/crtend.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h (struct sigaction):
Fix sa_flags size for sparc64; add sa_restorer for kernel.
* sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Fix PIC.
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscall.S: New file.
1997-08-10 18:29:08 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/login.c (login): Check for correct return value of
utmpname.
1997-08-11 16:49 Ulrich Drepper <drepper@cygnus.com>
* time/tzset.c (__tzset_internal): Correctly handle TZ strings
following incorrect old POSIX specs.
Patch by Paul Eggert <eggert@twinsun.com>.
* sysdeps/generic/bits/sigaction.h: Correct comment for SA_RESTART.
* sysdeps/unix/bsd/osf/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/minix/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/sigaction.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/math.texi: Define the macros @mul and @infinity and use
them to format the multiplication and infinity signs.
(FP Comparison Functions): Use @code, not @math, for C code
examples.
* elf/dl-profile.c: Add descriptions and implement reading of
1997-08-14 01:54:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static void
|
|
|
|
do_check_chunk (mstate av, mchunkptr p)
|
Update.
1997-08-14 03:14 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-minimal.c: Don't use relative #include paths.
(malloc): Don't try to initialize _dl_pagesize, it already is.
(__sigjmp_save, longjmp): Reformat.
* sysdeps/generic/dl-sysdep.c: Implement _dl_show_auxv function to
show content of auxiliary array.
(_dl_sysdep_start): Remember start of auxiliary vector.
* sysdeps/mach/hurd/dl-sysdep.c: (_dl_show_auxv): New dummy function.
* elf/link.h: Add prototype for _dl_show_auxv.
* elf/rtld.c (dl_main): Call _dl_show_auxv if LD_SHOW_AUXV envvar
is present.
* libio/iofdopen.c: Better prepare for use in libstdc++.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofopen.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* manual/creature.texi: Mention _XOPEN_SOURCE_EXTENDED in correct
place.
* manual/math.texi: Add comment to sincos decsription to say it's a
GNU extension.
Fix description of random function.
* posix/fnmatch.h: Recognize Windog by _WINDOWS32 not WIN32.
* posix/glob.c: Likewise. Handle stupid system headers on SunOS.
Add casts for all __alloca calls.
* posix/glob.h: Recognize Windog by _WINDOWS32 not WIN32.
Declare additional GLOB_* constants also if _GNU_SOURCE is defined.
Patches by Paul D. Smith <psmith@BayNetworks.COM>.
* stdio-common/_itoa.c: Don't use relateive #include paths.
* sysdeps/i386/fpu/bits/mathinline.h: Enable optimizations even for
gcc 2.7.
(atan): Loading 1.0 from memory does not pay off.
(asinh): Fix typo.
1997-08-13 09:44 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/stub/accept.c: Use socklen_t where necessary.
* sysdeps/stub/bind.c: Likewise.
* sysdeps/stub/connect.c: Likewise.
* sysdeps/stub/getsockname.c: Likewise.
* sysdeps/stub/getsockopt.c: Likewise.
* sysdeps/stub/recvfrom.c: Likewise.
* sysdeps/stub/sendto.c: Likewise.
* sysdeps/stub/setsockopt.c: Likewise.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* io/ftw.c (object_compare): Avoid memcmp when comparing scalar
types.
1997-08-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (cbrt_test): Add epsilon for long double to
`cbrt (-0.001)'.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/stub/bits/string.h: Fix comment.
1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/Makefile (routines): Remove dl-version.
(dl-routines): Add it here instead. This removes dead code from
libc.so.
1997-08-12 17:17 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/thread-m.h (thread_atfork, thread_atfork_static): New
macros to encapsulate pthread_atfork's functionality.
* malloc/malloc.c (ptmalloc_lock_all, ptmalloc_unlock_all): New
functions, registered via thread_atfork in the initialization
routine or via thread_atfork_static in global scope. This
ensures a consistent state of all locks across fork().
1997-08-11 23:00:32 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/programs/xtmp.c (compare_entry):
Partially undo patch made by Klaus Espenlaub. There
was no xtmp/utmp typo. Added comment to cclarify this.
* login/programs/xtmp.h: Likewise.
* posix/getopt.c: Recognize Windog by _WINDOWS32 not WIN32.
Patch by Paul D. Smith <psmith@BayNetworks.COM>.
1997-08-12 13:51 Ulrich Drepper <drepper@cygnus.com>
* login/getutid.c: Rename to __getutid and make getutid and getutxid
weak aliases.
Patch by ir. Mark M._Kettenis <kettenis@phys.uva.nl>.
1997-08-11 23:55 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
Add bits/mman.h.
1997-08-11 08:51:21 1997 H.J. Lu <hjl@gnu.ai.mit.edu>
* stdlib/fmtmsg.c (fmtmsg): Add static to
__libc_once_define macro.
* libc.map (__progname_full, __progname): Added.
1997-08-04 08:31 H.J. Lu <hjl@gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0
if SIOGIFINDEX is not defined.
(if_indextoname): Initialize "result" to NULL.
(if_nametoindex, if_nameindex): Fix ENOSYS setting.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc ISO C 9x exception handling:
* sysdeps/sparc/fpu/bits/mathdef.h: New file.
* sysdeps/sparc/fpu/fclrexcpt.c: New file.
* sysdeps/sparc/fpu/fegetenv.c: New file.
* sysdeps/sparc/fpu/fegetround.c: New file.
* sysdeps/sparc/fpu/feholdexcpt.c: New file.
* sysdeps/sparc/fpu/fesetenv.c: New file.
* sysdeps/sparc/fpu/fesetround.c: New file.
* sysdeps/sparc/fpu/feupdateenv.c: New file.
* sysdeps/sparc/fpu/fgetexcptflg.c: New file.
* sysdeps/sparc/fpu/fraiseexcpt.c: New file.
* sysdeps/sparc/fpu/fsetexcptflg.c: New file.
* sysdeps/sparc/fpu/ftestexcept.c: New file.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: New file.
* sysdeps/sparc/sparc64/fpu/bits/fenv.h: New file.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc64 merge:
* configure.in: Change up subdirectories, rename sparc8->sparcv8.
* csu/Makefile: Nuke need-nopic-initfini bits. The problem was
that sparc64 ld did not recognize pic relocs at all.
* elf/dl-deps.c: Include <string.h>.
* elf/do-rel.h (elf_dynamic_do_rel): Take reloc address and size
directly instead of the DT names to get them from.
* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): New macro distilled
from ELF_DYNAMIC_DO_REL{,A}. Define a second version that accounts
for the possibility that DT_RELA and DT_JMPPLT overlap, as such is
the case on the Sparc.
* elf/elf.h: Stub out Elf64_Ver*, and make them the same as the
Elf32_Ver* bits. The linker does not even know to differentiate
between the word sizes. Someone should examine this and figure
out what the proper sizes of things should be for 64-bit hosts
before the sparc64 libraries are distributed.
* shlib-versions: Rename sparc64 ld.so to not conflict with sparc32
on the same machine.
Move old sysdeps/sparc contents to sysdeps/sparc/sparc32,
rename sparc8 subdir to sparcv8, move sysdeps/sparc64 content to
sysdeps/sparc/sparc64. Same for sysdeps/unix/sysv/linux/sparc.
* sysdeps/sparc/Implies: Do ieee754 here.
* sysdeps/sparc/configure.in: Move from sparc32/.
* sysdeps/sparc/sparc32/Implies: Do wordsize here.
* sysdeps/sparc/sparc64/Implies: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_load_address):
Use uninitialized .got to find load address instead of AT_BASE, as
the later does not exist when running ld.so directly.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Move from ../.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Clean up PIC support.
* sysdeps/sparc/sparc64/Makefile (sysdep_routines): Add s_finitel
and s_signbitl for stdio.
* sysdeps/sparc/sparc64/configure.in: Remove, we no longer need
nopic_initfini.
* sysdeps/sparc/sparc64/bsd-_setjmp.S: Remove.
* sysdeps/sparc/sparc64/bsd-setjmp.S: Remove.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-_setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add __longjmp alias.
* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Add weak _setjmp
and setjmp entry points.
* sysdeps/sparc/sparc64/dl-machine.h: Finish real implementation.
* sysdeps/sparc/sparc64/elf/crtbegin.S: Add copyright, fix PIC.
* sysdeps/sparc/sparc64/elf/crtend.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h (struct sigaction):
Fix sa_flags size for sparc64; add sa_restorer for kernel.
* sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Fix PIC.
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscall.S: New file.
1997-08-10 18:29:08 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/login.c (login): Check for correct return value of
utmpname.
1997-08-11 16:49 Ulrich Drepper <drepper@cygnus.com>
* time/tzset.c (__tzset_internal): Correctly handle TZ strings
following incorrect old POSIX specs.
Patch by Paul Eggert <eggert@twinsun.com>.
* sysdeps/generic/bits/sigaction.h: Correct comment for SA_RESTART.
* sysdeps/unix/bsd/osf/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/minix/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/sigaction.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/math.texi: Define the macros @mul and @infinity and use
them to format the multiplication and infinity signs.
(FP Comparison Functions): Use @code, not @math, for C code
examples.
* elf/dl-profile.c: Add descriptions and implement reading of
1997-08-14 01:54:13 +00:00
|
|
|
{
|
2014-01-02 08:38:18 +00:00
|
|
|
unsigned long sz = chunksize (p);
|
2002-01-29 07:54:51 +00:00
|
|
|
/* min and max possible addresses assuming contiguous allocation */
|
2014-01-02 08:38:18 +00:00
|
|
|
char *max_address = (char *) (av->top) + chunksize (av->top);
|
|
|
|
char *min_address = max_address - av->system_mem;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (!chunk_is_mmapped (p))
|
|
|
|
{
|
|
|
|
/* Has legal address ... */
|
|
|
|
if (p != av->top)
|
|
|
|
{
|
|
|
|
if (contiguous (av))
|
|
|
|
{
|
|
|
|
assert (((char *) p) >= min_address);
|
|
|
|
assert (((char *) p + sz) <= ((char *) (av->top)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* top size is always at least MINSIZE */
|
|
|
|
assert ((unsigned long) (sz) >= MINSIZE);
|
|
|
|
/* top predecessor always marked inuse */
|
|
|
|
assert (prev_inuse (p));
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
2016-05-13 12:16:39 +00:00
|
|
|
else if (!DUMPED_MAIN_ARENA_CHUNK (p))
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
/* address is outside main heap */
|
|
|
|
if (contiguous (av) && av->top != initial_top (av))
|
|
|
|
{
|
|
|
|
assert (((char *) p) < min_address || ((char *) p) >= max_address);
|
|
|
|
}
|
|
|
|
/* chunk is page-aligned */
|
2016-10-28 14:26:57 +00:00
|
|
|
assert (((prev_size (p) + sz) & (GLRO (dl_pagesize) - 1)) == 0);
|
2014-01-02 08:38:18 +00:00
|
|
|
/* mem is aligned */
|
2021-03-11 14:49:45 +00:00
|
|
|
assert (aligned_OK (chunk2mem (p)));
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1998-05-04 13:19:20 +00:00
|
|
|
}
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Properties of free chunks
|
|
|
|
*/
|
1998-05-12 12:22:17 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static void
|
|
|
|
do_check_free_chunk (mstate av, mchunkptr p)
|
2001-08-11 08:57:41 +00:00
|
|
|
{
|
2017-10-17 17:55:16 +00:00
|
|
|
INTERNAL_SIZE_T sz = chunksize_nomask (p) & ~(PREV_INUSE | NON_MAIN_ARENA);
|
2014-01-02 08:38:18 +00:00
|
|
|
mchunkptr next = chunk_at_offset (p, sz);
|
2001-08-11 08:57:41 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
do_check_chunk (av, p);
|
2001-08-11 08:57:41 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Chunk must claim to be free ... */
|
2014-01-02 08:38:18 +00:00
|
|
|
assert (!inuse (p));
|
|
|
|
assert (!chunk_is_mmapped (p));
|
2001-08-11 08:57:41 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Unless a special marker, must have OK fields */
|
2014-01-02 08:38:18 +00:00
|
|
|
if ((unsigned long) (sz) >= MINSIZE)
|
|
|
|
{
|
|
|
|
assert ((sz & MALLOC_ALIGN_MASK) == 0);
|
2021-03-11 14:49:45 +00:00
|
|
|
assert (aligned_OK (chunk2mem (p)));
|
2014-01-02 08:38:18 +00:00
|
|
|
/* ... matching footer field */
|
2017-10-17 17:55:16 +00:00
|
|
|
assert (prev_size (next_chunk (p)) == sz);
|
2014-01-02 08:38:18 +00:00
|
|
|
/* ... and is fully consolidated */
|
|
|
|
assert (prev_inuse (p));
|
|
|
|
assert (next == av->top || inuse (next));
|
|
|
|
|
|
|
|
/* ... and has minimally sane links */
|
|
|
|
assert (p->fd->bk == p);
|
|
|
|
assert (p->bk->fd == p);
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
else /* markers are always of size SIZE_SZ */
|
2014-01-02 08:38:18 +00:00
|
|
|
assert (sz == SIZE_SZ);
|
2001-08-11 08:57:41 +00:00
|
|
|
}
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Properties of inuse chunks
|
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static void
|
|
|
|
do_check_inuse_chunk (mstate av, mchunkptr p)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
mchunkptr next;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
do_check_chunk (av, p);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (chunk_is_mmapped (p))
|
2002-01-29 07:54:51 +00:00
|
|
|
return; /* mmapped chunks have no next/prev */
|
Update.
1997-08-14 03:14 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-minimal.c: Don't use relative #include paths.
(malloc): Don't try to initialize _dl_pagesize, it already is.
(__sigjmp_save, longjmp): Reformat.
* sysdeps/generic/dl-sysdep.c: Implement _dl_show_auxv function to
show content of auxiliary array.
(_dl_sysdep_start): Remember start of auxiliary vector.
* sysdeps/mach/hurd/dl-sysdep.c: (_dl_show_auxv): New dummy function.
* elf/link.h: Add prototype for _dl_show_auxv.
* elf/rtld.c (dl_main): Call _dl_show_auxv if LD_SHOW_AUXV envvar
is present.
* libio/iofdopen.c: Better prepare for use in libstdc++.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofopen.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* manual/creature.texi: Mention _XOPEN_SOURCE_EXTENDED in correct
place.
* manual/math.texi: Add comment to sincos decsription to say it's a
GNU extension.
Fix description of random function.
* posix/fnmatch.h: Recognize Windog by _WINDOWS32 not WIN32.
* posix/glob.c: Likewise. Handle stupid system headers on SunOS.
Add casts for all __alloca calls.
* posix/glob.h: Recognize Windog by _WINDOWS32 not WIN32.
Declare additional GLOB_* constants also if _GNU_SOURCE is defined.
Patches by Paul D. Smith <psmith@BayNetworks.COM>.
* stdio-common/_itoa.c: Don't use relateive #include paths.
* sysdeps/i386/fpu/bits/mathinline.h: Enable optimizations even for
gcc 2.7.
(atan): Loading 1.0 from memory does not pay off.
(asinh): Fix typo.
1997-08-13 09:44 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/stub/accept.c: Use socklen_t where necessary.
* sysdeps/stub/bind.c: Likewise.
* sysdeps/stub/connect.c: Likewise.
* sysdeps/stub/getsockname.c: Likewise.
* sysdeps/stub/getsockopt.c: Likewise.
* sysdeps/stub/recvfrom.c: Likewise.
* sysdeps/stub/sendto.c: Likewise.
* sysdeps/stub/setsockopt.c: Likewise.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* io/ftw.c (object_compare): Avoid memcmp when comparing scalar
types.
1997-08-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (cbrt_test): Add epsilon for long double to
`cbrt (-0.001)'.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/stub/bits/string.h: Fix comment.
1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/Makefile (routines): Remove dl-version.
(dl-routines): Add it here instead. This removes dead code from
libc.so.
1997-08-12 17:17 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/thread-m.h (thread_atfork, thread_atfork_static): New
macros to encapsulate pthread_atfork's functionality.
* malloc/malloc.c (ptmalloc_lock_all, ptmalloc_unlock_all): New
functions, registered via thread_atfork in the initialization
routine or via thread_atfork_static in global scope. This
ensures a consistent state of all locks across fork().
1997-08-11 23:00:32 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/programs/xtmp.c (compare_entry):
Partially undo patch made by Klaus Espenlaub. There
was no xtmp/utmp typo. Added comment to cclarify this.
* login/programs/xtmp.h: Likewise.
* posix/getopt.c: Recognize Windog by _WINDOWS32 not WIN32.
Patch by Paul D. Smith <psmith@BayNetworks.COM>.
1997-08-12 13:51 Ulrich Drepper <drepper@cygnus.com>
* login/getutid.c: Rename to __getutid and make getutid and getutxid
weak aliases.
Patch by ir. Mark M._Kettenis <kettenis@phys.uva.nl>.
1997-08-11 23:55 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
Add bits/mman.h.
1997-08-11 08:51:21 1997 H.J. Lu <hjl@gnu.ai.mit.edu>
* stdlib/fmtmsg.c (fmtmsg): Add static to
__libc_once_define macro.
* libc.map (__progname_full, __progname): Added.
1997-08-04 08:31 H.J. Lu <hjl@gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0
if SIOGIFINDEX is not defined.
(if_indextoname): Initialize "result" to NULL.
(if_nametoindex, if_nameindex): Fix ENOSYS setting.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc ISO C 9x exception handling:
* sysdeps/sparc/fpu/bits/mathdef.h: New file.
* sysdeps/sparc/fpu/fclrexcpt.c: New file.
* sysdeps/sparc/fpu/fegetenv.c: New file.
* sysdeps/sparc/fpu/fegetround.c: New file.
* sysdeps/sparc/fpu/feholdexcpt.c: New file.
* sysdeps/sparc/fpu/fesetenv.c: New file.
* sysdeps/sparc/fpu/fesetround.c: New file.
* sysdeps/sparc/fpu/feupdateenv.c: New file.
* sysdeps/sparc/fpu/fgetexcptflg.c: New file.
* sysdeps/sparc/fpu/fraiseexcpt.c: New file.
* sysdeps/sparc/fpu/fsetexcptflg.c: New file.
* sysdeps/sparc/fpu/ftestexcept.c: New file.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: New file.
* sysdeps/sparc/sparc64/fpu/bits/fenv.h: New file.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc64 merge:
* configure.in: Change up subdirectories, rename sparc8->sparcv8.
* csu/Makefile: Nuke need-nopic-initfini bits. The problem was
that sparc64 ld did not recognize pic relocs at all.
* elf/dl-deps.c: Include <string.h>.
* elf/do-rel.h (elf_dynamic_do_rel): Take reloc address and size
directly instead of the DT names to get them from.
* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): New macro distilled
from ELF_DYNAMIC_DO_REL{,A}. Define a second version that accounts
for the possibility that DT_RELA and DT_JMPPLT overlap, as such is
the case on the Sparc.
* elf/elf.h: Stub out Elf64_Ver*, and make them the same as the
Elf32_Ver* bits. The linker does not even know to differentiate
between the word sizes. Someone should examine this and figure
out what the proper sizes of things should be for 64-bit hosts
before the sparc64 libraries are distributed.
* shlib-versions: Rename sparc64 ld.so to not conflict with sparc32
on the same machine.
Move old sysdeps/sparc contents to sysdeps/sparc/sparc32,
rename sparc8 subdir to sparcv8, move sysdeps/sparc64 content to
sysdeps/sparc/sparc64. Same for sysdeps/unix/sysv/linux/sparc.
* sysdeps/sparc/Implies: Do ieee754 here.
* sysdeps/sparc/configure.in: Move from sparc32/.
* sysdeps/sparc/sparc32/Implies: Do wordsize here.
* sysdeps/sparc/sparc64/Implies: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_load_address):
Use uninitialized .got to find load address instead of AT_BASE, as
the later does not exist when running ld.so directly.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Move from ../.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Clean up PIC support.
* sysdeps/sparc/sparc64/Makefile (sysdep_routines): Add s_finitel
and s_signbitl for stdio.
* sysdeps/sparc/sparc64/configure.in: Remove, we no longer need
nopic_initfini.
* sysdeps/sparc/sparc64/bsd-_setjmp.S: Remove.
* sysdeps/sparc/sparc64/bsd-setjmp.S: Remove.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-_setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add __longjmp alias.
* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Add weak _setjmp
and setjmp entry points.
* sysdeps/sparc/sparc64/dl-machine.h: Finish real implementation.
* sysdeps/sparc/sparc64/elf/crtbegin.S: Add copyright, fix PIC.
* sysdeps/sparc/sparc64/elf/crtend.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h (struct sigaction):
Fix sa_flags size for sparc64; add sa_restorer for kernel.
* sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Fix PIC.
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscall.S: New file.
1997-08-10 18:29:08 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/login.c (login): Check for correct return value of
utmpname.
1997-08-11 16:49 Ulrich Drepper <drepper@cygnus.com>
* time/tzset.c (__tzset_internal): Correctly handle TZ strings
following incorrect old POSIX specs.
Patch by Paul Eggert <eggert@twinsun.com>.
* sysdeps/generic/bits/sigaction.h: Correct comment for SA_RESTART.
* sysdeps/unix/bsd/osf/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/minix/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/sigaction.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/math.texi: Define the macros @mul and @infinity and use
them to format the multiplication and infinity signs.
(FP Comparison Functions): Use @code, not @math, for C code
examples.
* elf/dl-profile.c: Add descriptions and implement reading of
1997-08-14 01:54:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Check whether it claims to be in use ... */
|
2014-01-02 08:38:18 +00:00
|
|
|
assert (inuse (p));
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
next = next_chunk (p);
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* ... and is surrounded by OK chunks.
|
2014-01-02 08:38:18 +00:00
|
|
|
Since more things can be checked with free chunks than inuse ones,
|
|
|
|
if an inuse chunk borders them and debug is on, it's worth doing them.
|
|
|
|
*/
|
|
|
|
if (!prev_inuse (p))
|
|
|
|
{
|
|
|
|
/* Note that we cannot even look at prev unless it is not inuse */
|
|
|
|
mchunkptr prv = prev_chunk (p);
|
|
|
|
assert (next_chunk (prv) == p);
|
|
|
|
do_check_free_chunk (av, prv);
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (next == av->top)
|
|
|
|
{
|
|
|
|
assert (prev_inuse (next));
|
|
|
|
assert (chunksize (next) >= MINSIZE);
|
|
|
|
}
|
|
|
|
else if (!inuse (next))
|
|
|
|
do_check_free_chunk (av, next);
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
}
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Properties of chunks recycled from fastbins
|
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static void
|
|
|
|
do_check_remalloced_chunk (mstate av, mchunkptr p, INTERNAL_SIZE_T s)
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
{
|
2017-10-17 17:55:16 +00:00
|
|
|
INTERNAL_SIZE_T sz = chunksize_nomask (p) & ~(PREV_INUSE | NON_MAIN_ARENA);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (!chunk_is_mmapped (p))
|
|
|
|
{
|
|
|
|
assert (av == arena_for_chunk (p));
|
2016-10-28 14:26:57 +00:00
|
|
|
if (chunk_main_arena (p))
|
2014-01-02 08:38:18 +00:00
|
|
|
assert (av == &main_arena);
|
2016-10-28 14:26:57 +00:00
|
|
|
else
|
|
|
|
assert (av != &main_arena);
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
do_check_inuse_chunk (av, p);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/* Legal size ... */
|
2014-01-02 08:38:18 +00:00
|
|
|
assert ((sz & MALLOC_ALIGN_MASK) == 0);
|
|
|
|
assert ((unsigned long) (sz) >= MINSIZE);
|
2002-01-29 07:54:51 +00:00
|
|
|
/* ... and alignment */
|
2021-03-11 14:49:45 +00:00
|
|
|
assert (aligned_OK (chunk2mem (p)));
|
2002-01-29 07:54:51 +00:00
|
|
|
/* chunk is less than MINSIZE more than request */
|
2014-01-02 08:38:18 +00:00
|
|
|
assert ((long) (sz) - (long) (s) >= 0);
|
|
|
|
assert ((long) (sz) - (long) (s + MINSIZE) < 0);
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
}
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Properties of nonrecycled chunks at the point they are malloced
|
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static void
|
|
|
|
do_check_malloced_chunk (mstate av, mchunkptr p, INTERNAL_SIZE_T s)
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
/* same as recycled case ... */
|
2014-01-02 08:38:18 +00:00
|
|
|
do_check_remalloced_chunk (av, p, s);
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
... plus, must obey implementation invariant that prev_inuse is
|
|
|
|
always true of any allocated chunk; i.e., that each allocated
|
|
|
|
chunk borders either a previously allocated and still in-use
|
|
|
|
chunk, or the base of its memory arena. This is ensured
|
|
|
|
by making all allocations from the `lowest' part of any found
|
|
|
|
chunk. This does not necessarily hold however for chunks
|
|
|
|
recycled via fastbins.
|
|
|
|
*/
|
|
|
|
|
|
|
|
assert (prev_inuse (p));
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Properties of malloc_state.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
This may be useful for debugging malloc, as well as detecting user
|
|
|
|
programmer errors that somehow write into malloc_state.
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
If you are extending or experimenting with this malloc, you can
|
|
|
|
probably figure out how to hack this routine to print out or
|
|
|
|
display chunk addresses, sizes, bins, and other instrumentation.
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static void
|
|
|
|
do_check_malloc_state (mstate av)
|
2002-01-29 07:54:51 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
mchunkptr p;
|
|
|
|
mchunkptr q;
|
|
|
|
mbinptr b;
|
|
|
|
unsigned int idx;
|
|
|
|
INTERNAL_SIZE_T size;
|
|
|
|
unsigned long total = 0;
|
|
|
|
int max_fast_bin;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* internal size_t must be no wider than pointer type */
|
2014-01-02 08:38:18 +00:00
|
|
|
assert (sizeof (INTERNAL_SIZE_T) <= sizeof (char *));
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* alignment is a power of 2 */
|
2014-01-02 08:38:18 +00:00
|
|
|
assert ((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT - 1)) == 0);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
/* Check the arena is initialized. */
|
|
|
|
assert (av->top != 0);
|
|
|
|
|
|
|
|
/* No memory has been allocated yet, so doing more tests is not possible. */
|
|
|
|
if (av->top == initial_top (av))
|
2002-01-29 07:54:51 +00:00
|
|
|
return;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* pagesize is a power of 2 */
|
2015-02-18 00:25:01 +00:00
|
|
|
assert (powerof2(GLRO (dl_pagesize)));
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* A contiguous main_arena is consistent with sbrk_base. */
|
2014-01-02 08:38:18 +00:00
|
|
|
if (av == &main_arena && contiguous (av))
|
|
|
|
assert ((char *) mp_.sbrk_base + av->system_mem ==
|
|
|
|
(char *) av->top + chunksize (av->top));
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/* properties of fastbins */
|
|
|
|
|
|
|
|
/* max_fast is in allowed range */
|
2014-01-02 08:38:18 +00:00
|
|
|
assert ((get_max_fast () & ~1) <= request2size (MAX_FAST_SIZE));
|
|
|
|
|
|
|
|
max_fast_bin = fastbin_index (get_max_fast ());
|
|
|
|
|
|
|
|
for (i = 0; i < NFASTBINS; ++i)
|
|
|
|
{
|
|
|
|
p = fastbin (av, i);
|
|
|
|
|
|
|
|
/* The following test can only be performed for the main arena.
|
|
|
|
While mallopt calls malloc_consolidate to get rid of all fast
|
|
|
|
bins (especially those larger than the new maximum) this does
|
|
|
|
only happen for the main arena. Trying to do this for any
|
|
|
|
other arena would mean those arenas have to be locked and
|
|
|
|
malloc_consolidate be called for them. This is excessive. And
|
|
|
|
even if this is acceptable to somebody it still cannot solve
|
|
|
|
the problem completely since if the arena is locked a
|
|
|
|
concurrent malloc call might create a new arena which then
|
|
|
|
could use the newly invalid fast bins. */
|
|
|
|
|
|
|
|
/* all bins past max_fast are empty */
|
|
|
|
if (av == &main_arena && i > max_fast_bin)
|
|
|
|
assert (p == 0);
|
|
|
|
|
|
|
|
while (p != 0)
|
|
|
|
{
|
2020-03-31 06:00:14 +00:00
|
|
|
if (__glibc_unlikely (misaligned_chunk (p)))
|
2020-03-31 05:55:13 +00:00
|
|
|
malloc_printerr ("do_check_malloc_state(): "
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
"unaligned fastbin chunk detected");
|
2014-01-02 08:38:18 +00:00
|
|
|
/* each chunk claims to be inuse */
|
|
|
|
do_check_inuse_chunk (av, p);
|
|
|
|
total += chunksize (p);
|
|
|
|
/* chunk belongs in this bin */
|
|
|
|
assert (fastbin_index (chunksize (p)) == i);
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
p = REVEAL_PTR (p->fd);
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* check normal bins */
|
2014-01-02 08:38:18 +00:00
|
|
|
for (i = 1; i < NBINS; ++i)
|
|
|
|
{
|
|
|
|
b = bin_at (av, i);
|
|
|
|
|
|
|
|
/* binmap is accurate (except for bin 1 == unsorted_chunks) */
|
|
|
|
if (i >= 2)
|
|
|
|
{
|
|
|
|
unsigned int binbit = get_binmap (av, i);
|
|
|
|
int empty = last (b) == b;
|
|
|
|
if (!binbit)
|
|
|
|
assert (empty);
|
|
|
|
else if (!empty)
|
|
|
|
assert (binbit);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (p = last (b); p != b; p = p->bk)
|
|
|
|
{
|
|
|
|
/* each chunk claims to be free */
|
|
|
|
do_check_free_chunk (av, p);
|
|
|
|
size = chunksize (p);
|
|
|
|
total += size;
|
|
|
|
if (i >= 2)
|
|
|
|
{
|
|
|
|
/* chunk belongs in bin */
|
|
|
|
idx = bin_index (size);
|
|
|
|
assert (idx == i);
|
|
|
|
/* lists are sorted */
|
|
|
|
assert (p->bk == b ||
|
|
|
|
(unsigned long) chunksize (p->bk) >= (unsigned long) chunksize (p));
|
|
|
|
|
|
|
|
if (!in_smallbin_range (size))
|
|
|
|
{
|
|
|
|
if (p->fd_nextsize != NULL)
|
|
|
|
{
|
|
|
|
if (p->fd_nextsize == p)
|
|
|
|
assert (p->bk_nextsize == p);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (p->fd_nextsize == first (b))
|
|
|
|
assert (chunksize (p) < chunksize (p->fd_nextsize));
|
|
|
|
else
|
|
|
|
assert (chunksize (p) > chunksize (p->fd_nextsize));
|
|
|
|
|
|
|
|
if (p == first (b))
|
|
|
|
assert (chunksize (p) > chunksize (p->bk_nextsize));
|
|
|
|
else
|
|
|
|
assert (chunksize (p) < chunksize (p->bk_nextsize));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
assert (p->bk_nextsize == NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (!in_smallbin_range (size))
|
|
|
|
assert (p->fd_nextsize == NULL && p->bk_nextsize == NULL);
|
|
|
|
/* chunk is followed by a legal chain of inuse chunks */
|
|
|
|
for (q = next_chunk (p);
|
|
|
|
(q != av->top && inuse (q) &&
|
|
|
|
(unsigned long) (chunksize (q)) >= MINSIZE);
|
|
|
|
q = next_chunk (q))
|
|
|
|
do_check_inuse_chunk (av, q);
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* top chunk is OK */
|
2014-01-02 08:38:18 +00:00
|
|
|
check_chunk (av, av->top);
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* ----------------- Support for debugging hooks -------------------- */
|
|
|
|
#include "hooks.c"
|
|
|
|
|
|
|
|
|
|
|
|
/* ----------- Routines dealing with system allocation -------------- */
|
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
sysmalloc handles malloc cases requiring more memory from the system.
|
|
|
|
On entry, it is assumed that av->top does not have enough
|
|
|
|
space to service request for nb bytes, thus requiring that av->top
|
|
|
|
be extended or replaced.
|
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static void *
|
|
|
|
sysmalloc (INTERNAL_SIZE_T nb, mstate av)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2014-01-02 08:38:18 +00:00
|
|
|
mchunkptr old_top; /* incoming value of av->top */
|
2002-01-29 07:54:51 +00:00
|
|
|
INTERNAL_SIZE_T old_size; /* its size */
|
2014-01-02 08:38:18 +00:00
|
|
|
char *old_end; /* its end address */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
long size; /* arg to first MORECORE or mmap call */
|
|
|
|
char *brk; /* return value from MORECORE */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
long correction; /* arg to 2nd MORECORE call */
|
|
|
|
char *snd_brk; /* 2nd return val */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
INTERNAL_SIZE_T front_misalign; /* unusable bytes at front of new space */
|
|
|
|
INTERNAL_SIZE_T end_misalign; /* partial page left at end of new space */
|
2014-01-02 08:38:18 +00:00
|
|
|
char *aligned_brk; /* aligned offset into brk */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
mchunkptr p; /* the allocated/returned chunk */
|
|
|
|
mchunkptr remainder; /* remainder from allocation */
|
|
|
|
unsigned long remainder_size; /* its size */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
|
2015-02-18 00:25:01 +00:00
|
|
|
size_t pagesize = GLRO (dl_pagesize);
|
2014-01-02 08:38:18 +00:00
|
|
|
bool tried_mmap = false;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
If have mmap, and the request size meets the mmap threshold, and
|
|
|
|
the system supports mmap, and there are few enough currently
|
|
|
|
allocated mmapped regions, try to directly map this request
|
|
|
|
rather than expanding top.
|
|
|
|
*/
|
|
|
|
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
if (av == NULL
|
|
|
|
|| ((unsigned long) (nb) >= (unsigned long) (mp_.mmap_threshold)
|
|
|
|
&& (mp_.n_mmaps < mp_.n_mmaps_max)))
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
char *mm; /* return value from mmap call*/
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
try_mmap:
|
|
|
|
/*
|
|
|
|
Round up size to nearest page. For mmapped chunks, the overhead
|
|
|
|
is one SIZE_SZ unit larger than for normal chunks, because there
|
|
|
|
is no following chunk whose prev_size field could be used.
|
|
|
|
|
|
|
|
See the front_misalign handling below, for glibc there is no
|
|
|
|
need for further alignments unless we have have high alignment.
|
|
|
|
*/
|
2020-12-21 15:03:03 +00:00
|
|
|
if (MALLOC_ALIGNMENT == CHUNK_HDR_SZ)
|
2015-02-18 00:25:01 +00:00
|
|
|
size = ALIGN_UP (nb + SIZE_SZ, pagesize);
|
2014-01-02 08:38:18 +00:00
|
|
|
else
|
2015-02-18 00:25:01 +00:00
|
|
|
size = ALIGN_UP (nb + SIZE_SZ + MALLOC_ALIGN_MASK, pagesize);
|
2014-01-02 08:38:18 +00:00
|
|
|
tried_mmap = true;
|
|
|
|
|
|
|
|
/* Don't try if size wraps around 0 */
|
|
|
|
if ((unsigned long) (size) > (unsigned long) (nb))
|
|
|
|
{
|
2020-12-21 15:03:03 +00:00
|
|
|
mm = (char *) (MMAP (0, size,
|
2021-02-16 14:12:25 +00:00
|
|
|
mtag_mmap_flags | PROT_READ | PROT_WRITE, 0));
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
if (mm != MAP_FAILED)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
The offset to the start of the mmapped region is stored
|
|
|
|
in the prev_size field of the chunk. This allows us to adjust
|
|
|
|
returned start address to meet alignment requirements here
|
|
|
|
and in memalign(), and still be able to compute proper
|
|
|
|
address argument for later munmap in free() and realloc().
|
|
|
|
*/
|
|
|
|
|
2020-12-21 15:03:03 +00:00
|
|
|
if (MALLOC_ALIGNMENT == CHUNK_HDR_SZ)
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
2021-03-11 14:49:45 +00:00
|
|
|
/* For glibc, chunk2mem increases the address by
|
2020-12-21 15:03:03 +00:00
|
|
|
CHUNK_HDR_SZ and MALLOC_ALIGN_MASK is
|
|
|
|
CHUNK_HDR_SZ-1. Each mmap'ed area is page
|
|
|
|
aligned and therefore definitely
|
|
|
|
MALLOC_ALIGN_MASK-aligned. */
|
2021-03-11 14:49:45 +00:00
|
|
|
assert (((INTERNAL_SIZE_T) chunk2mem (mm) & MALLOC_ALIGN_MASK) == 0);
|
2014-01-02 08:38:18 +00:00
|
|
|
front_misalign = 0;
|
|
|
|
}
|
|
|
|
else
|
2021-03-11 14:49:45 +00:00
|
|
|
front_misalign = (INTERNAL_SIZE_T) chunk2mem (mm) & MALLOC_ALIGN_MASK;
|
2014-01-02 08:38:18 +00:00
|
|
|
if (front_misalign > 0)
|
|
|
|
{
|
|
|
|
correction = MALLOC_ALIGNMENT - front_misalign;
|
|
|
|
p = (mchunkptr) (mm + correction);
|
2016-10-28 14:26:57 +00:00
|
|
|
set_prev_size (p, correction);
|
2014-01-02 08:38:18 +00:00
|
|
|
set_head (p, (size - correction) | IS_MMAPPED);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
p = (mchunkptr) mm;
|
2016-10-27 17:45:19 +00:00
|
|
|
set_prev_size (p, 0);
|
2014-01-02 08:38:18 +00:00
|
|
|
set_head (p, size | IS_MMAPPED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* update statistics */
|
|
|
|
|
|
|
|
int new = atomic_exchange_and_add (&mp_.n_mmaps, 1) + 1;
|
|
|
|
atomic_max (&mp_.max_n_mmaps, new);
|
|
|
|
|
|
|
|
unsigned long sum;
|
|
|
|
sum = atomic_exchange_and_add (&mp_.mmapped_mem, size) + size;
|
|
|
|
atomic_max (&mp_.max_mmapped_mem, sum);
|
|
|
|
|
|
|
|
check_chunk (av, p);
|
|
|
|
|
2021-03-11 14:49:45 +00:00
|
|
|
return chunk2mem (p);
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
|
|
|
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
/* There are no usable arenas and mmap also failed. */
|
|
|
|
if (av == NULL)
|
|
|
|
return 0;
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Record incoming configuration of top */
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
old_top = av->top;
|
|
|
|
old_size = chunksize (old_top);
|
|
|
|
old_end = (char *) (chunk_at_offset (old_top, old_size));
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
brk = snd_brk = (char *) (MORECORE_FAILURE);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
/*
|
2002-01-29 07:54:51 +00:00
|
|
|
If not the first time through, we require old_size to be
|
|
|
|
at least MINSIZE and to have prev_inuse set.
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
assert ((old_top == initial_top (av) && old_size == 0) ||
|
|
|
|
((unsigned long) (old_size) >= MINSIZE &&
|
|
|
|
prev_inuse (old_top) &&
|
2015-02-18 00:25:01 +00:00
|
|
|
((unsigned long) old_end & (pagesize - 1)) == 0));
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/* Precondition: not enough current space to satisfy nb request */
|
2014-01-02 08:38:18 +00:00
|
|
|
assert ((unsigned long) (old_size) < (unsigned long) (nb + MINSIZE));
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2009-08-31 11:55:10 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (av != &main_arena)
|
|
|
|
{
|
|
|
|
heap_info *old_heap, *heap;
|
|
|
|
size_t old_heap_size;
|
|
|
|
|
|
|
|
/* First try to extend the current heap. */
|
|
|
|
old_heap = heap_for_ptr (old_top);
|
|
|
|
old_heap_size = old_heap->size;
|
|
|
|
if ((long) (MINSIZE + nb - old_size) > 0
|
|
|
|
&& grow_heap (old_heap, MINSIZE + nb - old_size) == 0)
|
|
|
|
{
|
|
|
|
av->system_mem += old_heap->size - old_heap_size;
|
|
|
|
set_head (old_top, (((char *) old_heap + old_heap->size) - (char *) old_top)
|
|
|
|
| PREV_INUSE);
|
|
|
|
}
|
|
|
|
else if ((heap = new_heap (nb + (MINSIZE + sizeof (*heap)), mp_.top_pad)))
|
|
|
|
{
|
|
|
|
/* Use a newly allocated heap. */
|
|
|
|
heap->ar_ptr = av;
|
|
|
|
heap->prev = old_heap;
|
|
|
|
av->system_mem += heap->size;
|
|
|
|
/* Set up the new top. */
|
|
|
|
top (av) = chunk_at_offset (heap, sizeof (*heap));
|
|
|
|
set_head (top (av), (heap->size - sizeof (*heap)) | PREV_INUSE);
|
|
|
|
|
|
|
|
/* Setup fencepost and free the old top chunk with a multiple of
|
|
|
|
MALLOC_ALIGNMENT in size. */
|
|
|
|
/* The fencepost takes at least MINSIZE bytes, because it might
|
|
|
|
become the top chunk again later. Note that a footer is set
|
|
|
|
up, too, although the chunk is marked in use. */
|
|
|
|
old_size = (old_size - MINSIZE) & ~MALLOC_ALIGN_MASK;
|
2020-12-21 15:03:03 +00:00
|
|
|
set_head (chunk_at_offset (old_top, old_size + CHUNK_HDR_SZ),
|
|
|
|
0 | PREV_INUSE);
|
2014-01-02 08:38:18 +00:00
|
|
|
if (old_size >= MINSIZE)
|
|
|
|
{
|
2020-12-21 15:03:03 +00:00
|
|
|
set_head (chunk_at_offset (old_top, old_size),
|
|
|
|
CHUNK_HDR_SZ | PREV_INUSE);
|
|
|
|
set_foot (chunk_at_offset (old_top, old_size), CHUNK_HDR_SZ);
|
2014-01-02 08:38:18 +00:00
|
|
|
set_head (old_top, old_size | PREV_INUSE | NON_MAIN_ARENA);
|
|
|
|
_int_free (av, old_top, 1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-12-21 15:03:03 +00:00
|
|
|
set_head (old_top, (old_size + CHUNK_HDR_SZ) | PREV_INUSE);
|
|
|
|
set_foot (old_top, (old_size + CHUNK_HDR_SZ));
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (!tried_mmap)
|
|
|
|
/* We can at least try to use to mmap memory. */
|
|
|
|
goto try_mmap;
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
2014-01-02 08:38:18 +00:00
|
|
|
else /* av == main_arena */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
{ /* Request enough space for nb + pad + overhead */
|
|
|
|
size = nb + mp_.top_pad + MINSIZE;
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
/*
|
|
|
|
If contiguous, we can subtract out existing space that we hope to
|
|
|
|
combine with new space. We add it back later only if
|
|
|
|
we don't actually get contiguous space.
|
|
|
|
*/
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (contiguous (av))
|
|
|
|
size -= old_size;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
/*
|
|
|
|
Round to a multiple of page size.
|
|
|
|
If MORECORE is not contiguous, this ensures that we only call it
|
|
|
|
with whole-page arguments. And if MORECORE is contiguous and
|
|
|
|
this is not first time through, this preserves page-alignment of
|
|
|
|
previous calls. Otherwise, we correct to page-align below.
|
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2015-02-18 00:25:01 +00:00
|
|
|
size = ALIGN_UP (size, pagesize);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
/*
|
|
|
|
Don't try to call MORECORE if argument is so big as to appear
|
|
|
|
negative. Note that since mmap takes size_t arg, it may succeed
|
|
|
|
below even if we cannot call MORECORE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (size > 0)
|
|
|
|
{
|
|
|
|
brk = (char *) (MORECORE (size));
|
|
|
|
LIBC_PROBE (memory_sbrk_more, 2, brk, size);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (brk != (char *) (MORECORE_FAILURE))
|
|
|
|
{
|
|
|
|
/* Call the `morecore' hook if necessary. */
|
|
|
|
void (*hook) (void) = atomic_forced_read (__after_morecore_hook);
|
|
|
|
if (__builtin_expect (hook != NULL, 0))
|
|
|
|
(*hook)();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
If have mmap, try using it as a backup when MORECORE fails or
|
|
|
|
cannot be used. This is worth doing on systems that have "holes" in
|
|
|
|
address space, so sbrk cannot extend to give contiguous space, but
|
|
|
|
space is available elsewhere. Note that we ignore mmap max count
|
|
|
|
and threshold limits, since the space will not be used as a
|
|
|
|
segregated mmap region.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Cannot merge with old top, so add its size back in */
|
|
|
|
if (contiguous (av))
|
2015-02-18 00:25:01 +00:00
|
|
|
size = ALIGN_UP (size + old_size, pagesize);
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
/* If we are relying on mmap as backup, then use larger units */
|
|
|
|
if ((unsigned long) (size) < (unsigned long) (MMAP_AS_MORECORE_SIZE))
|
|
|
|
size = MMAP_AS_MORECORE_SIZE;
|
|
|
|
|
|
|
|
/* Don't try if size wraps around 0 */
|
|
|
|
if ((unsigned long) (size) > (unsigned long) (nb))
|
|
|
|
{
|
2020-12-21 15:03:03 +00:00
|
|
|
char *mbrk = (char *) (MMAP (0, size,
|
2021-02-16 14:12:25 +00:00
|
|
|
mtag_mmap_flags | PROT_READ | PROT_WRITE,
|
2020-12-21 15:03:03 +00:00
|
|
|
0));
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
if (mbrk != MAP_FAILED)
|
|
|
|
{
|
|
|
|
/* We do not need, and cannot use, another sbrk call to find end */
|
|
|
|
brk = mbrk;
|
|
|
|
snd_brk = brk + size;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Record that we no longer have a contiguous sbrk region.
|
|
|
|
After the first time mmap is used as backup, we do not
|
|
|
|
ever rely on contiguous space since this could incorrectly
|
|
|
|
bridge regions.
|
|
|
|
*/
|
|
|
|
set_noncontiguous (av);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (brk != (char *) (MORECORE_FAILURE))
|
|
|
|
{
|
|
|
|
if (mp_.sbrk_base == 0)
|
|
|
|
mp_.sbrk_base = brk;
|
|
|
|
av->system_mem += size;
|
|
|
|
|
|
|
|
/*
|
|
|
|
If MORECORE extends previous space, we can likewise extend top size.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (brk == old_end && snd_brk == (char *) (MORECORE_FAILURE))
|
|
|
|
set_head (old_top, (size + old_size) | PREV_INUSE);
|
|
|
|
|
|
|
|
else if (contiguous (av) && old_size && brk < old_end)
|
2017-08-30 17:29:38 +00:00
|
|
|
/* Oops! Someone else killed our space.. Can't touch anything. */
|
|
|
|
malloc_printerr ("break adjusted to free malloc space");
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
Otherwise, make adjustments:
|
|
|
|
|
|
|
|
* If the first time through or noncontiguous, we need to call sbrk
|
|
|
|
just to find out where the end of memory lies.
|
|
|
|
|
|
|
|
* We need to ensure that all returned chunks from malloc will meet
|
|
|
|
MALLOC_ALIGNMENT
|
|
|
|
|
|
|
|
* If there was an intervening foreign sbrk, we need to adjust sbrk
|
|
|
|
request size to account for fact that we will not be able to
|
|
|
|
combine new space with existing space in old_top.
|
|
|
|
|
|
|
|
* Almost all systems internally allocate whole pages at a time, in
|
|
|
|
which case we might as well use the whole last page of request.
|
|
|
|
So we allocate enough more memory to hit a page boundary now,
|
|
|
|
which in turn causes future contiguous calls to page-align.
|
|
|
|
*/
|
|
|
|
|
|
|
|
else
|
|
|
|
{
|
|
|
|
front_misalign = 0;
|
|
|
|
end_misalign = 0;
|
|
|
|
correction = 0;
|
|
|
|
aligned_brk = brk;
|
|
|
|
|
|
|
|
/* handle contiguous cases */
|
|
|
|
if (contiguous (av))
|
|
|
|
{
|
|
|
|
/* Count foreign sbrk as system_mem. */
|
|
|
|
if (old_size)
|
|
|
|
av->system_mem += brk - old_end;
|
|
|
|
|
|
|
|
/* Guarantee alignment of first new chunk made from this space */
|
|
|
|
|
2021-03-11 14:49:45 +00:00
|
|
|
front_misalign = (INTERNAL_SIZE_T) chunk2mem (brk) & MALLOC_ALIGN_MASK;
|
2014-01-02 08:38:18 +00:00
|
|
|
if (front_misalign > 0)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Skip over some bytes to arrive at an aligned position.
|
|
|
|
We don't need to specially mark these wasted front bytes.
|
|
|
|
They will never be accessed anyway because
|
|
|
|
prev_inuse of av->top (and any chunk created from its start)
|
|
|
|
is always true after initialization.
|
|
|
|
*/
|
|
|
|
|
|
|
|
correction = MALLOC_ALIGNMENT - front_misalign;
|
|
|
|
aligned_brk += correction;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
If this isn't adjacent to existing space, then we will not
|
|
|
|
be able to merge with old_top space, so must add to 2nd request.
|
|
|
|
*/
|
|
|
|
|
|
|
|
correction += old_size;
|
|
|
|
|
|
|
|
/* Extend the end address to hit a page boundary */
|
|
|
|
end_misalign = (INTERNAL_SIZE_T) (brk + size + correction);
|
2015-02-18 00:25:01 +00:00
|
|
|
correction += (ALIGN_UP (end_misalign, pagesize)) - end_misalign;
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
assert (correction >= 0);
|
|
|
|
snd_brk = (char *) (MORECORE (correction));
|
|
|
|
|
|
|
|
/*
|
|
|
|
If can't allocate correction, try to at least find out current
|
|
|
|
brk. It might be enough to proceed without failing.
|
|
|
|
|
|
|
|
Note that if second sbrk did NOT fail, we assume that space
|
|
|
|
is contiguous with first sbrk. This is a safe assumption unless
|
|
|
|
program is multithreaded but doesn't use locks and a foreign sbrk
|
|
|
|
occurred between our first and second calls.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (snd_brk == (char *) (MORECORE_FAILURE))
|
|
|
|
{
|
|
|
|
correction = 0;
|
|
|
|
snd_brk = (char *) (MORECORE (0));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Call the `morecore' hook if necessary. */
|
|
|
|
void (*hook) (void) = atomic_forced_read (__after_morecore_hook);
|
|
|
|
if (__builtin_expect (hook != NULL, 0))
|
|
|
|
(*hook)();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* handle non-contiguous cases */
|
|
|
|
else
|
|
|
|
{
|
2020-12-21 15:03:03 +00:00
|
|
|
if (MALLOC_ALIGNMENT == CHUNK_HDR_SZ)
|
2014-01-02 08:38:18 +00:00
|
|
|
/* MORECORE/mmap must correctly align */
|
2021-03-11 14:49:45 +00:00
|
|
|
assert (((unsigned long) chunk2mem (brk) & MALLOC_ALIGN_MASK) == 0);
|
2014-01-02 08:38:18 +00:00
|
|
|
else
|
|
|
|
{
|
2021-03-11 14:49:45 +00:00
|
|
|
front_misalign = (INTERNAL_SIZE_T) chunk2mem (brk) & MALLOC_ALIGN_MASK;
|
2014-01-02 08:38:18 +00:00
|
|
|
if (front_misalign > 0)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Skip over some bytes to arrive at an aligned position.
|
|
|
|
We don't need to specially mark these wasted front bytes.
|
|
|
|
They will never be accessed anyway because
|
|
|
|
prev_inuse of av->top (and any chunk created from its start)
|
|
|
|
is always true after initialization.
|
|
|
|
*/
|
|
|
|
|
|
|
|
aligned_brk += MALLOC_ALIGNMENT - front_misalign;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find out current end of memory */
|
|
|
|
if (snd_brk == (char *) (MORECORE_FAILURE))
|
|
|
|
{
|
|
|
|
snd_brk = (char *) (MORECORE (0));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Adjust top based on results of second sbrk */
|
|
|
|
if (snd_brk != (char *) (MORECORE_FAILURE))
|
|
|
|
{
|
|
|
|
av->top = (mchunkptr) aligned_brk;
|
|
|
|
set_head (av->top, (snd_brk - aligned_brk + correction) | PREV_INUSE);
|
|
|
|
av->system_mem += correction;
|
|
|
|
|
|
|
|
/*
|
|
|
|
If not the first time through, we either have a
|
|
|
|
gap due to foreign sbrk or a non-contiguous region. Insert a
|
|
|
|
double fencepost at old_top to prevent consolidation with space
|
|
|
|
we don't own. These fenceposts are artificial chunks that are
|
|
|
|
marked as inuse and are in any case too small to use. We need
|
|
|
|
two to make sizes and alignments work out.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (old_size != 0)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Shrink old_top to insert fenceposts, keeping size a
|
|
|
|
multiple of MALLOC_ALIGNMENT. We know there is at least
|
|
|
|
enough space in old_top to do this.
|
|
|
|
*/
|
2020-12-21 15:03:03 +00:00
|
|
|
old_size = (old_size - 2 * CHUNK_HDR_SZ) & ~MALLOC_ALIGN_MASK;
|
2014-01-02 08:38:18 +00:00
|
|
|
set_head (old_top, old_size | PREV_INUSE);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Note that the following assignments completely overwrite
|
|
|
|
old_top when old_size was previously MINSIZE. This is
|
|
|
|
intentional. We need the fencepost, even if old_top otherwise gets
|
|
|
|
lost.
|
|
|
|
*/
|
2016-10-28 14:26:57 +00:00
|
|
|
set_head (chunk_at_offset (old_top, old_size),
|
2020-12-21 15:03:03 +00:00
|
|
|
CHUNK_HDR_SZ | PREV_INUSE);
|
|
|
|
set_head (chunk_at_offset (old_top,
|
|
|
|
old_size + CHUNK_HDR_SZ),
|
|
|
|
CHUNK_HDR_SZ | PREV_INUSE);
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
/* If possible, release the rest. */
|
|
|
|
if (old_size >= MINSIZE)
|
|
|
|
{
|
|
|
|
_int_free (av, old_top, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} /* if (av != &main_arena) */
|
|
|
|
|
|
|
|
if ((unsigned long) av->system_mem > (unsigned long) (av->max_system_mem))
|
2002-01-29 07:54:51 +00:00
|
|
|
av->max_system_mem = av->system_mem;
|
2014-01-02 08:38:18 +00:00
|
|
|
check_malloc_state (av);
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* finally, do the allocation */
|
|
|
|
p = av->top;
|
2014-01-02 08:38:18 +00:00
|
|
|
size = chunksize (p);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/* check that one of the above allocation paths succeeded */
|
2014-01-02 08:38:18 +00:00
|
|
|
if ((unsigned long) (size) >= (unsigned long) (nb + MINSIZE))
|
|
|
|
{
|
|
|
|
remainder_size = size - nb;
|
|
|
|
remainder = chunk_at_offset (p, nb);
|
|
|
|
av->top = remainder;
|
|
|
|
set_head (p, nb | PREV_INUSE | (av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
set_head (remainder, remainder_size | PREV_INUSE);
|
|
|
|
check_malloced_chunk (av, p, nb);
|
2021-03-11 14:49:45 +00:00
|
|
|
return chunk2mem (p);
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/* catch all failure paths */
|
2011-09-11 02:12:38 +00:00
|
|
|
__set_errno (ENOMEM);
|
2002-01-29 07:54:51 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
systrim is an inverse of sorts to sysmalloc. It gives memory back
|
|
|
|
to the system (via negative arguments to sbrk) if there is unused
|
|
|
|
memory at the `high' end of the malloc pool. It is called
|
|
|
|
automatically by free() when top space exceeds the trim
|
|
|
|
threshold. It is also called by the public malloc_trim routine. It
|
|
|
|
returns 1 if it actually released any memory, else 0.
|
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static int
|
|
|
|
systrim (size_t pad, mstate av)
|
2002-01-29 07:54:51 +00:00
|
|
|
{
|
2014-01-02 08:38:18 +00:00
|
|
|
long top_size; /* Amount of top-most memory */
|
|
|
|
long extra; /* Amount to release */
|
|
|
|
long released; /* Amount actually released */
|
|
|
|
char *current_brk; /* address returned by pre-check sbrk call */
|
|
|
|
char *new_brk; /* address returned by post-check sbrk call */
|
2015-02-18 00:25:01 +00:00
|
|
|
size_t pagesize;
|
2014-01-02 08:38:18 +00:00
|
|
|
long top_area;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2015-02-18 00:25:01 +00:00
|
|
|
pagesize = GLRO (dl_pagesize);
|
2014-01-02 08:38:18 +00:00
|
|
|
top_size = chunksize (av->top);
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2013-12-06 17:04:10 +00:00
|
|
|
top_area = top_size - MINSIZE - 1;
|
|
|
|
if (top_area <= pad)
|
|
|
|
return 0;
|
|
|
|
|
2015-09-14 19:32:47 +00:00
|
|
|
/* Release in pagesize units and round down to the nearest page. */
|
|
|
|
extra = ALIGN_DOWN(top_area - pad, pagesize);
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2014-06-13 15:37:12 +00:00
|
|
|
if (extra == 0)
|
|
|
|
return 0;
|
|
|
|
|
2013-12-06 17:04:10 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Only proceed if end of memory is where we last set it.
|
|
|
|
This avoids problems if there were foreign sbrk calls.
|
|
|
|
*/
|
|
|
|
current_brk = (char *) (MORECORE (0));
|
|
|
|
if (current_brk == (char *) (av->top) + top_size)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Attempt to release memory. We ignore MORECORE return value,
|
|
|
|
and instead call again to find out where new end of memory is.
|
|
|
|
This avoids problems if first call releases less than we asked,
|
|
|
|
of if failure somehow altered brk value. (We could still
|
|
|
|
encounter problems if it altered brk in some very bad way,
|
|
|
|
but the only thing we can do is adjust anyway, which will cause
|
|
|
|
some downstream failure.)
|
|
|
|
*/
|
|
|
|
|
|
|
|
MORECORE (-extra);
|
|
|
|
/* Call the `morecore' hook if necessary. */
|
|
|
|
void (*hook) (void) = atomic_forced_read (__after_morecore_hook);
|
|
|
|
if (__builtin_expect (hook != NULL, 0))
|
|
|
|
(*hook)();
|
|
|
|
new_brk = (char *) (MORECORE (0));
|
|
|
|
|
|
|
|
LIBC_PROBE (memory_sbrk_less, 2, new_brk, extra);
|
|
|
|
|
|
|
|
if (new_brk != (char *) MORECORE_FAILURE)
|
|
|
|
{
|
|
|
|
released = (long) (current_brk - new_brk);
|
|
|
|
|
|
|
|
if (released != 0)
|
|
|
|
{
|
|
|
|
/* Success. Adjust top. */
|
|
|
|
av->system_mem -= released;
|
|
|
|
set_head (av->top, (top_size - released) | PREV_INUSE);
|
|
|
|
check_malloc_state (av);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
|
|
|
return 0;
|
1996-12-08 08:01:13 +00:00
|
|
|
}
|
|
|
|
|
1999-05-17 10:09:50 +00:00
|
|
|
static void
|
2014-01-02 08:38:18 +00:00
|
|
|
munmap_chunk (mchunkptr p)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2018-12-21 05:13:01 +00:00
|
|
|
size_t pagesize = GLRO (dl_pagesize);
|
2014-01-02 08:38:18 +00:00
|
|
|
INTERNAL_SIZE_T size = chunksize (p);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
assert (chunk_is_mmapped (p));
|
2005-11-06 17:08:48 +00:00
|
|
|
|
2016-05-13 12:16:39 +00:00
|
|
|
/* Do nothing if the chunk is a faked mmapped chunk in the dumped
|
|
|
|
main arena. We never free this memory. */
|
|
|
|
if (DUMPED_MAIN_ARENA_CHUNK (p))
|
|
|
|
return;
|
|
|
|
|
2021-03-11 14:49:45 +00:00
|
|
|
uintptr_t mem = (uintptr_t) chunk2mem (p);
|
2016-10-28 14:26:57 +00:00
|
|
|
uintptr_t block = (uintptr_t) p - prev_size (p);
|
|
|
|
size_t total_size = prev_size (p) + size;
|
2005-11-06 17:08:48 +00:00
|
|
|
/* Unfortunately we have to do the compilers job by hand here. Normally
|
|
|
|
we would test BLOCK and TOTAL-SIZE separately for compliance with the
|
|
|
|
page size. But gcc does not recognize the optimization possibility
|
|
|
|
(in the moment at least) so we combine the two values into one before
|
|
|
|
the bit test. */
|
2018-12-21 05:13:01 +00:00
|
|
|
if (__glibc_unlikely ((block | total_size) & (pagesize - 1)) != 0
|
|
|
|
|| __glibc_unlikely (!powerof2 (mem & (pagesize - 1))))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("munmap_chunk(): invalid pointer");
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2013-10-30 15:24:38 +00:00
|
|
|
atomic_decrement (&mp_.n_mmaps);
|
|
|
|
atomic_add (&mp_.mmapped_mem, -total_size);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2011-10-29 20:39:03 +00:00
|
|
|
/* If munmap failed the process virtual memory address space is in a
|
|
|
|
bad shape. Just leave the block hanging around, the process will
|
|
|
|
terminate shortly anyway since not much can be done. */
|
2014-01-02 08:38:18 +00:00
|
|
|
__munmap ((char *) block, total_size);
|
1996-12-08 08:01:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#if HAVE_MREMAP
|
|
|
|
|
1999-05-17 10:09:50 +00:00
|
|
|
static mchunkptr
|
2014-01-02 08:38:18 +00:00
|
|
|
mremap_chunk (mchunkptr p, size_t new_size)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2015-02-18 00:25:01 +00:00
|
|
|
size_t pagesize = GLRO (dl_pagesize);
|
2016-10-28 14:26:57 +00:00
|
|
|
INTERNAL_SIZE_T offset = prev_size (p);
|
2014-01-02 08:38:18 +00:00
|
|
|
INTERNAL_SIZE_T size = chunksize (p);
|
1996-12-08 08:01:13 +00:00
|
|
|
char *cp;
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
assert (chunk_is_mmapped (p));
|
2018-12-21 04:30:07 +00:00
|
|
|
|
|
|
|
uintptr_t block = (uintptr_t) p - offset;
|
2021-03-11 14:49:45 +00:00
|
|
|
uintptr_t mem = (uintptr_t) chunk2mem(p);
|
2018-12-21 04:30:07 +00:00
|
|
|
size_t total_size = offset + size;
|
|
|
|
if (__glibc_unlikely ((block | total_size) & (pagesize - 1)) != 0
|
|
|
|
|| __glibc_unlikely (!powerof2 (mem & (pagesize - 1))))
|
|
|
|
malloc_printerr("mremap_chunk(): invalid pointer");
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/* Note the extra SIZE_SZ overhead as in mmap_chunk(). */
|
2015-02-18 00:25:01 +00:00
|
|
|
new_size = ALIGN_UP (new_size + offset + SIZE_SZ, pagesize);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2007-10-02 04:19:37 +00:00
|
|
|
/* No need to remap if the number of pages does not change. */
|
2018-12-21 04:30:07 +00:00
|
|
|
if (total_size == new_size)
|
2007-10-02 04:19:37 +00:00
|
|
|
return p;
|
|
|
|
|
2018-12-21 04:30:07 +00:00
|
|
|
cp = (char *) __mremap ((char *) block, total_size, new_size,
|
2014-01-02 08:38:18 +00:00
|
|
|
MREMAP_MAYMOVE);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (cp == MAP_FAILED)
|
|
|
|
return 0;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
p = (mchunkptr) (cp + offset);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2021-03-11 14:49:45 +00:00
|
|
|
assert (aligned_OK (chunk2mem (p)));
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2016-10-28 14:26:57 +00:00
|
|
|
assert (prev_size (p) == offset);
|
2014-01-02 08:38:18 +00:00
|
|
|
set_head (p, (new_size - offset) | IS_MMAPPED);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2013-10-30 15:24:38 +00:00
|
|
|
INTERNAL_SIZE_T new;
|
|
|
|
new = atomic_exchange_and_add (&mp_.mmapped_mem, new_size - size - offset)
|
2014-01-02 08:38:18 +00:00
|
|
|
+ new_size - size - offset;
|
2013-10-30 15:24:38 +00:00
|
|
|
atomic_max (&mp_.max_mmapped_mem, new);
|
1996-12-08 08:01:13 +00:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
#endif /* HAVE_MREMAP */
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*------------------------ Public wrappers. --------------------------------*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
|
|
|
|
/* We overlay this structure on the user-data portion of a chunk when
|
|
|
|
the chunk is stored in the per-thread cache. */
|
|
|
|
typedef struct tcache_entry
|
|
|
|
{
|
|
|
|
struct tcache_entry *next;
|
2018-11-20 18:24:09 +00:00
|
|
|
/* This field exists to detect double frees. */
|
|
|
|
struct tcache_perthread_struct *key;
|
2017-07-06 17:37:30 +00:00
|
|
|
} tcache_entry;
|
|
|
|
|
|
|
|
/* There is one of these for each thread, which contains the
|
|
|
|
per-thread cache (hence "tcache_perthread_struct"). Keeping
|
|
|
|
overall size low is mildly important. Note that COUNTS and ENTRIES
|
|
|
|
are redundant (we could have just counted the linked list each
|
|
|
|
time), this is for performance reasons. */
|
|
|
|
typedef struct tcache_perthread_struct
|
|
|
|
{
|
2019-05-17 17:16:20 +00:00
|
|
|
uint16_t counts[TCACHE_MAX_BINS];
|
2017-07-06 17:37:30 +00:00
|
|
|
tcache_entry *entries[TCACHE_MAX_BINS];
|
|
|
|
} tcache_perthread_struct;
|
|
|
|
|
2017-09-28 17:05:18 +00:00
|
|
|
static __thread bool tcache_shutting_down = false;
|
2017-07-06 17:37:30 +00:00
|
|
|
static __thread tcache_perthread_struct *tcache = NULL;
|
|
|
|
|
|
|
|
/* Caller must ensure that we know tc_idx is valid and there's room
|
|
|
|
for more chunks. */
|
2017-10-17 17:25:43 +00:00
|
|
|
static __always_inline void
|
2017-07-06 17:37:30 +00:00
|
|
|
tcache_put (mchunkptr chunk, size_t tc_idx)
|
|
|
|
{
|
2021-03-11 14:49:45 +00:00
|
|
|
tcache_entry *e = (tcache_entry *) chunk2mem (chunk);
|
2018-11-20 18:24:09 +00:00
|
|
|
|
|
|
|
/* Mark this chunk as "in the tcache" so the test in _int_free will
|
|
|
|
detect a double free. */
|
|
|
|
e->key = tcache;
|
|
|
|
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
e->next = PROTECT_PTR (&e->next, tcache->entries[tc_idx]);
|
2017-07-06 17:37:30 +00:00
|
|
|
tcache->entries[tc_idx] = e;
|
|
|
|
++(tcache->counts[tc_idx]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Caller must ensure that we know tc_idx is valid and there's
|
|
|
|
available chunks to remove. */
|
2017-10-17 17:25:43 +00:00
|
|
|
static __always_inline void *
|
2017-07-06 17:37:30 +00:00
|
|
|
tcache_get (size_t tc_idx)
|
|
|
|
{
|
|
|
|
tcache_entry *e = tcache->entries[tc_idx];
|
2020-03-31 06:00:14 +00:00
|
|
|
if (__glibc_unlikely (!aligned_OK (e)))
|
|
|
|
malloc_printerr ("malloc(): unaligned tcache chunk detected");
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
tcache->entries[tc_idx] = REVEAL_PTR (e->next);
|
2017-07-06 17:37:30 +00:00
|
|
|
--(tcache->counts[tc_idx]);
|
2018-11-20 18:24:09 +00:00
|
|
|
e->key = NULL;
|
2017-07-06 17:37:30 +00:00
|
|
|
return (void *) e;
|
|
|
|
}
|
|
|
|
|
2017-11-23 13:47:31 +00:00
|
|
|
static void
|
|
|
|
tcache_thread_shutdown (void)
|
2017-07-06 17:37:30 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
tcache_perthread_struct *tcache_tmp = tcache;
|
|
|
|
|
|
|
|
if (!tcache)
|
|
|
|
return;
|
|
|
|
|
2017-09-28 17:05:18 +00:00
|
|
|
/* Disable the tcache and prevent it from being reinitialized. */
|
2017-07-06 17:37:30 +00:00
|
|
|
tcache = NULL;
|
2017-09-28 17:05:18 +00:00
|
|
|
tcache_shutting_down = true;
|
2017-07-06 17:37:30 +00:00
|
|
|
|
2017-09-28 17:05:18 +00:00
|
|
|
/* Free all of the entries and the tcache itself back to the arena
|
|
|
|
heap for coalescing. */
|
2017-07-06 17:37:30 +00:00
|
|
|
for (i = 0; i < TCACHE_MAX_BINS; ++i)
|
|
|
|
{
|
|
|
|
while (tcache_tmp->entries[i])
|
|
|
|
{
|
|
|
|
tcache_entry *e = tcache_tmp->entries[i];
|
2020-03-31 05:55:13 +00:00
|
|
|
if (__glibc_unlikely (!aligned_OK (e)))
|
|
|
|
malloc_printerr ("tcache_thread_shutdown(): "
|
|
|
|
"unaligned tcache chunk detected");
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
tcache_tmp->entries[i] = REVEAL_PTR (e->next);
|
2017-07-06 17:37:30 +00:00
|
|
|
__libc_free (e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
__libc_free (tcache_tmp);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
tcache_init(void)
|
|
|
|
{
|
|
|
|
mstate ar_ptr;
|
|
|
|
void *victim = 0;
|
|
|
|
const size_t bytes = sizeof (tcache_perthread_struct);
|
|
|
|
|
|
|
|
if (tcache_shutting_down)
|
|
|
|
return;
|
|
|
|
|
|
|
|
arena_get (ar_ptr, bytes);
|
|
|
|
victim = _int_malloc (ar_ptr, bytes);
|
|
|
|
if (!victim && ar_ptr != NULL)
|
|
|
|
{
|
|
|
|
ar_ptr = arena_get_retry (ar_ptr, bytes);
|
|
|
|
victim = _int_malloc (ar_ptr, bytes);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (ar_ptr != NULL)
|
|
|
|
__libc_lock_unlock (ar_ptr->mutex);
|
|
|
|
|
|
|
|
/* In a low memory situation, we may not be able to allocate memory
|
|
|
|
- in which case, we just keep trying later. However, we
|
|
|
|
typically do this very early, so either there is sufficient
|
|
|
|
memory, or there isn't enough memory to do non-trivial
|
|
|
|
allocations anyway. */
|
|
|
|
if (victim)
|
|
|
|
{
|
|
|
|
tcache = (tcache_perthread_struct *) victim;
|
|
|
|
memset (tcache, 0, sizeof (tcache_perthread_struct));
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2017-11-23 13:47:31 +00:00
|
|
|
# define MAYBE_INIT_TCACHE() \
|
2017-07-06 17:37:30 +00:00
|
|
|
if (__glibc_unlikely (tcache == NULL)) \
|
|
|
|
tcache_init();
|
|
|
|
|
2017-11-23 13:47:31 +00:00
|
|
|
#else /* !USE_TCACHE */
|
|
|
|
# define MAYBE_INIT_TCACHE()
|
|
|
|
|
|
|
|
static void
|
|
|
|
tcache_thread_shutdown (void)
|
|
|
|
{
|
|
|
|
/* Nothing to do if there is no thread cache. */
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* !USE_TCACHE */
|
2017-07-06 17:37:30 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
void *
|
|
|
|
__libc_malloc (size_t bytes)
|
2002-01-29 07:54:51 +00:00
|
|
|
{
|
|
|
|
mstate ar_ptr;
|
2011-09-10 22:10:17 +00:00
|
|
|
void *victim;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
_Static_assert (PTRDIFF_MAX <= SIZE_MAX / 2,
|
|
|
|
"PTRDIFF_MAX is not more than half of SIZE_MAX");
|
|
|
|
|
2013-03-08 21:27:42 +00:00
|
|
|
void *(*hook) (size_t, const void *)
|
2013-12-09 16:14:12 +00:00
|
|
|
= atomic_forced_read (__malloc_hook);
|
2009-02-07 19:05:28 +00:00
|
|
|
if (__builtin_expect (hook != NULL, 0))
|
2002-01-29 07:54:51 +00:00
|
|
|
return (*hook)(bytes, RETURN_ADDRESS (0));
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
/* int_free also calls request2size, be careful to not pad twice. */
|
2017-11-30 12:31:45 +00:00
|
|
|
size_t tbytes;
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
if (!checked_request2size (bytes, &tbytes))
|
|
|
|
{
|
|
|
|
__set_errno (ENOMEM);
|
|
|
|
return NULL;
|
|
|
|
}
|
2017-07-06 17:37:30 +00:00
|
|
|
size_t tc_idx = csize2tidx (tbytes);
|
|
|
|
|
|
|
|
MAYBE_INIT_TCACHE ();
|
|
|
|
|
|
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
|
|
if (tc_idx < mp_.tcache_bins
|
|
|
|
&& tcache
|
2019-05-17 17:16:20 +00:00
|
|
|
&& tcache->counts[tc_idx] > 0)
|
2017-07-06 17:37:30 +00:00
|
|
|
{
|
2020-12-21 15:03:03 +00:00
|
|
|
victim = tcache_get (tc_idx);
|
2021-02-16 14:12:25 +00:00
|
|
|
return tag_new_usable (victim);
|
2017-07-06 17:37:30 +00:00
|
|
|
}
|
|
|
|
DIAG_POP_NEEDS_COMMENT;
|
|
|
|
#endif
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-10-24 11:39:24 +00:00
|
|
|
if (SINGLE_THREAD_P)
|
|
|
|
{
|
2021-02-16 14:12:25 +00:00
|
|
|
victim = tag_new_usable (_int_malloc (&main_arena, bytes));
|
2017-10-24 11:39:24 +00:00
|
|
|
assert (!victim || chunk_is_mmapped (mem2chunk (victim)) ||
|
|
|
|
&main_arena == arena_for_chunk (mem2chunk (victim)));
|
|
|
|
return victim;
|
|
|
|
}
|
|
|
|
|
2015-02-18 05:36:05 +00:00
|
|
|
arena_get (ar_ptr, bytes);
|
2009-03-13 23:53:18 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
victim = _int_malloc (ar_ptr, bytes);
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
/* Retry with another arena only if we were able to find a usable arena
|
|
|
|
before. */
|
|
|
|
if (!victim && ar_ptr != NULL)
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_malloc_retry, 1, bytes);
|
|
|
|
ar_ptr = arena_get_retry (ar_ptr, bytes);
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
victim = _int_malloc (ar_ptr, bytes);
|
2000-08-19 16:58:09 +00:00
|
|
|
}
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
|
|
|
|
if (ar_ptr != NULL)
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_unlock (ar_ptr->mutex);
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
|
2021-02-16 14:12:25 +00:00
|
|
|
victim = tag_new_usable (victim);
|
2020-12-21 15:03:03 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
assert (!victim || chunk_is_mmapped (mem2chunk (victim)) ||
|
|
|
|
ar_ptr == arena_for_chunk (mem2chunk (victim)));
|
2002-01-29 07:54:51 +00:00
|
|
|
return victim;
|
1996-12-08 08:01:13 +00:00
|
|
|
}
|
2014-01-02 08:38:18 +00:00
|
|
|
libc_hidden_def (__libc_malloc)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
void
|
2014-01-02 08:38:18 +00:00
|
|
|
__libc_free (void *mem)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
mstate ar_ptr;
|
|
|
|
mchunkptr p; /* chunk corresponding to mem */
|
|
|
|
|
2013-03-08 21:27:42 +00:00
|
|
|
void (*hook) (void *, const void *)
|
2013-12-09 16:14:12 +00:00
|
|
|
= atomic_forced_read (__free_hook);
|
2014-01-02 08:38:18 +00:00
|
|
|
if (__builtin_expect (hook != NULL, 0))
|
|
|
|
{
|
|
|
|
(*hook)(mem, RETURN_ADDRESS (0));
|
|
|
|
return;
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
if (mem == 0) /* free(0) has no effect */
|
|
|
|
return;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2020-12-21 15:03:03 +00:00
|
|
|
/* Quickly check that the freed pointer matches the tag for the memory.
|
|
|
|
This gives a useful double-free detection. */
|
2021-02-17 10:15:18 +00:00
|
|
|
if (__glibc_unlikely (mtag_enabled))
|
|
|
|
*(volatile char *)mem;
|
2020-12-21 15:03:03 +00:00
|
|
|
|
2020-12-29 08:45:49 +00:00
|
|
|
int err = errno;
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
p = mem2chunk (mem);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (chunk_is_mmapped (p)) /* release mmapped memory. */
|
|
|
|
{
|
2016-05-13 12:16:39 +00:00
|
|
|
/* See if the dynamic brk/mmap threshold needs adjusting.
|
|
|
|
Dumped fake mmapped chunks do not affect the threshold. */
|
2014-01-02 08:38:18 +00:00
|
|
|
if (!mp_.no_dyn_threshold
|
2016-10-28 14:26:57 +00:00
|
|
|
&& chunksize_nomask (p) > mp_.mmap_threshold
|
|
|
|
&& chunksize_nomask (p) <= DEFAULT_MMAP_THRESHOLD_MAX
|
2016-05-13 12:16:39 +00:00
|
|
|
&& !DUMPED_MAIN_ARENA_CHUNK (p))
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
mp_.mmap_threshold = chunksize (p);
|
|
|
|
mp_.trim_threshold = 2 * mp_.mmap_threshold;
|
|
|
|
LIBC_PROBE (memory_mallopt_free_dyn_thresholds, 2,
|
|
|
|
mp_.mmap_threshold, mp_.trim_threshold);
|
|
|
|
}
|
|
|
|
munmap_chunk (p);
|
|
|
|
}
|
2020-12-29 08:45:49 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
MAYBE_INIT_TCACHE ();
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2021-02-04 11:52:14 +00:00
|
|
|
/* Mark the chunk as belonging to the library again. */
|
2021-03-11 14:49:45 +00:00
|
|
|
(void)tag_region (chunk2mem (p), memsize (p));
|
2021-02-04 11:52:14 +00:00
|
|
|
|
2020-12-29 08:45:49 +00:00
|
|
|
ar_ptr = arena_for_chunk (p);
|
|
|
|
_int_free (ar_ptr, p, 0);
|
|
|
|
}
|
2017-07-06 17:37:30 +00:00
|
|
|
|
2020-12-29 08:45:49 +00:00
|
|
|
__set_errno (err);
|
1996-12-08 08:01:13 +00:00
|
|
|
}
|
2012-01-31 23:49:22 +00:00
|
|
|
libc_hidden_def (__libc_free)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
void *
|
|
|
|
__libc_realloc (void *oldmem, size_t bytes)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
mstate ar_ptr;
|
2014-01-02 08:38:18 +00:00
|
|
|
INTERNAL_SIZE_T nb; /* padded request size */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
void *newp; /* chunk to return */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2013-03-08 21:27:42 +00:00
|
|
|
void *(*hook) (void *, size_t, const void *) =
|
2013-12-09 16:14:12 +00:00
|
|
|
atomic_forced_read (__realloc_hook);
|
2009-02-07 19:05:28 +00:00
|
|
|
if (__builtin_expect (hook != NULL, 0))
|
2002-01-29 07:54:51 +00:00
|
|
|
return (*hook)(oldmem, bytes, RETURN_ADDRESS (0));
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#if REALLOC_ZERO_BYTES_FREES
|
2014-01-02 08:38:18 +00:00
|
|
|
if (bytes == 0 && oldmem != NULL)
|
|
|
|
{
|
|
|
|
__libc_free (oldmem); return 0;
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
#endif
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* realloc of null is supposed to be same as malloc */
|
2014-01-02 08:38:18 +00:00
|
|
|
if (oldmem == 0)
|
|
|
|
return __libc_malloc (bytes);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2020-12-21 15:03:03 +00:00
|
|
|
/* Perform a quick check to ensure that the pointer's tag matches the
|
|
|
|
memory's tag. */
|
2021-02-17 10:15:18 +00:00
|
|
|
if (__glibc_unlikely (mtag_enabled))
|
|
|
|
*(volatile char*) oldmem;
|
2020-12-21 15:03:03 +00:00
|
|
|
|
2009-02-07 22:01:49 +00:00
|
|
|
/* chunk corresponding to oldmem */
|
2014-01-02 08:38:18 +00:00
|
|
|
const mchunkptr oldp = mem2chunk (oldmem);
|
2009-02-07 22:01:49 +00:00
|
|
|
/* its size */
|
2014-01-02 08:38:18 +00:00
|
|
|
const INTERNAL_SIZE_T oldsize = chunksize (oldp);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
if (chunk_is_mmapped (oldp))
|
|
|
|
ar_ptr = NULL;
|
|
|
|
else
|
2017-07-06 17:37:30 +00:00
|
|
|
{
|
|
|
|
MAYBE_INIT_TCACHE ();
|
|
|
|
ar_ptr = arena_for_chunk (oldp);
|
|
|
|
}
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
|
2016-05-13 12:16:39 +00:00
|
|
|
/* Little security check which won't hurt performance: the allocator
|
|
|
|
never wrapps around at the end of the address space. Therefore
|
|
|
|
we can exclude some size values which might appear here by
|
|
|
|
accident or by "design" from some intruder. We need to bypass
|
|
|
|
this check for dumped fake mmap chunks from the old main arena
|
|
|
|
because the new malloc may provide additional alignment. */
|
|
|
|
if ((__builtin_expect ((uintptr_t) oldp > (uintptr_t) -oldsize, 0)
|
|
|
|
|| __builtin_expect (misaligned_chunk (oldp), 0))
|
|
|
|
&& !DUMPED_MAIN_ARENA_CHUNK (oldp))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("realloc(): invalid pointer");
|
2004-12-10 01:36:18 +00:00
|
|
|
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
if (!checked_request2size (bytes, &nb))
|
|
|
|
{
|
|
|
|
__set_errno (ENOMEM);
|
|
|
|
return NULL;
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (chunk_is_mmapped (oldp))
|
|
|
|
{
|
2016-05-13 12:16:39 +00:00
|
|
|
/* If this is a faked mmapped chunk from the dumped main arena,
|
|
|
|
always make a copy (and do not free the old chunk). */
|
|
|
|
if (DUMPED_MAIN_ARENA_CHUNK (oldp))
|
|
|
|
{
|
|
|
|
/* Must alloc, copy, free. */
|
|
|
|
void *newmem = __libc_malloc (bytes);
|
|
|
|
if (newmem == 0)
|
|
|
|
return NULL;
|
|
|
|
/* Copy as many bytes as are available from the old chunk
|
2016-06-08 18:50:21 +00:00
|
|
|
and fit into the new size. NB: The overhead for faked
|
2020-12-21 15:03:03 +00:00
|
|
|
mmapped chunks is only SIZE_SZ, not CHUNK_HDR_SZ as for
|
2016-06-08 18:50:21 +00:00
|
|
|
regular mmapped chunks. */
|
|
|
|
if (bytes > oldsize - SIZE_SZ)
|
|
|
|
bytes = oldsize - SIZE_SZ;
|
2016-05-13 12:16:39 +00:00
|
|
|
memcpy (newmem, oldmem, bytes);
|
|
|
|
return newmem;
|
|
|
|
}
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
void *newmem;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
#if HAVE_MREMAP
|
2014-01-02 08:38:18 +00:00
|
|
|
newp = mremap_chunk (oldp, nb);
|
|
|
|
if (newp)
|
2020-12-21 15:03:03 +00:00
|
|
|
{
|
2021-03-11 14:49:45 +00:00
|
|
|
void *newmem = chunk2mem_tag (newp);
|
2020-12-21 15:03:03 +00:00
|
|
|
/* Give the new block a different tag. This helps to ensure
|
|
|
|
that stale handles to the previous mapping are not
|
|
|
|
reused. There's a performance hit for both us and the
|
|
|
|
caller for doing this, so we might want to
|
|
|
|
reconsider. */
|
2021-02-16 14:12:25 +00:00
|
|
|
return tag_new_usable (newmem);
|
2020-12-21 15:03:03 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
#endif
|
2014-01-02 08:38:18 +00:00
|
|
|
/* Note the extra SIZE_SZ overhead. */
|
|
|
|
if (oldsize - SIZE_SZ >= nb)
|
|
|
|
return oldmem; /* do nothing */
|
|
|
|
|
|
|
|
/* Must alloc, copy, free. */
|
|
|
|
newmem = __libc_malloc (bytes);
|
|
|
|
if (newmem == 0)
|
|
|
|
return 0; /* propagate failure */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2020-12-21 15:03:03 +00:00
|
|
|
memcpy (newmem, oldmem, oldsize - CHUNK_HDR_SZ);
|
2014-01-02 08:38:18 +00:00
|
|
|
munmap_chunk (oldp);
|
|
|
|
return newmem;
|
|
|
|
}
|
|
|
|
|
2017-10-24 11:39:24 +00:00
|
|
|
if (SINGLE_THREAD_P)
|
|
|
|
{
|
|
|
|
newp = _int_realloc (ar_ptr, oldp, oldsize, nb);
|
|
|
|
assert (!newp || chunk_is_mmapped (mem2chunk (newp)) ||
|
|
|
|
ar_ptr == arena_for_chunk (mem2chunk (newp)));
|
|
|
|
|
|
|
|
return newp;
|
|
|
|
}
|
|
|
|
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_lock (ar_ptr->mutex);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
newp = _int_realloc (ar_ptr, oldp, oldsize, nb);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_unlock (ar_ptr->mutex);
|
2014-01-02 08:38:18 +00:00
|
|
|
assert (!newp || chunk_is_mmapped (mem2chunk (newp)) ||
|
|
|
|
ar_ptr == arena_for_chunk (mem2chunk (newp)));
|
2006-08-28 00:58:32 +00:00
|
|
|
|
|
|
|
if (newp == NULL)
|
|
|
|
{
|
|
|
|
/* Try harder to allocate memory in other arenas. */
|
2013-09-20 14:10:55 +00:00
|
|
|
LIBC_PROBE (memory_realloc_retry, 2, bytes, oldmem);
|
2014-01-02 08:38:18 +00:00
|
|
|
newp = __libc_malloc (bytes);
|
2006-08-28 00:58:32 +00:00
|
|
|
if (newp != NULL)
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
2021-03-08 12:59:05 +00:00
|
|
|
size_t sz = memsize (oldp);
|
2021-02-25 14:49:58 +00:00
|
|
|
memcpy (newp, oldmem, sz);
|
2021-03-11 14:49:45 +00:00
|
|
|
(void) tag_region (chunk2mem (oldp), sz);
|
2014-01-02 08:38:18 +00:00
|
|
|
_int_free (ar_ptr, oldp, 0);
|
|
|
|
}
|
2006-08-28 00:58:32 +00:00
|
|
|
}
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
return newp;
|
|
|
|
}
|
2012-01-31 23:49:22 +00:00
|
|
|
libc_hidden_def (__libc_realloc)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
void *
|
|
|
|
__libc_memalign (size_t alignment, size_t bytes)
|
2013-11-20 14:46:02 +00:00
|
|
|
{
|
|
|
|
void *address = RETURN_ADDRESS (0);
|
|
|
|
return _mid_memalign (alignment, bytes, address);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *
|
|
|
|
_mid_memalign (size_t alignment, size_t bytes, void *address)
|
2002-01-29 07:54:51 +00:00
|
|
|
{
|
|
|
|
mstate ar_ptr;
|
2011-09-10 22:10:17 +00:00
|
|
|
void *p;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2013-03-08 21:27:42 +00:00
|
|
|
void *(*hook) (size_t, size_t, const void *) =
|
2013-12-09 16:14:12 +00:00
|
|
|
atomic_forced_read (__memalign_hook);
|
2009-02-07 19:05:28 +00:00
|
|
|
if (__builtin_expect (hook != NULL, 0))
|
2013-11-20 14:46:02 +00:00
|
|
|
return (*hook)(alignment, bytes, address);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2013-11-20 14:46:02 +00:00
|
|
|
/* If we need less alignment than we give anyway, just relay to malloc. */
|
2014-01-02 08:38:18 +00:00
|
|
|
if (alignment <= MALLOC_ALIGNMENT)
|
|
|
|
return __libc_malloc (bytes);
|
1997-02-03 03:18:58 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Otherwise, ensure that it is at least a minimum chunk size */
|
2014-01-02 08:38:18 +00:00
|
|
|
if (alignment < MINSIZE)
|
|
|
|
alignment = MINSIZE;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2013-10-10 12:17:13 +00:00
|
|
|
/* If the alignment is greater than SIZE_MAX / 2 + 1 it cannot be a
|
|
|
|
power of 2 and will cause overflow in the check below. */
|
|
|
|
if (alignment > SIZE_MAX / 2 + 1)
|
|
|
|
{
|
|
|
|
__set_errno (EINVAL);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-11-20 14:46:02 +00:00
|
|
|
|
|
|
|
/* Make sure alignment is power of 2. */
|
2014-01-02 08:38:18 +00:00
|
|
|
if (!powerof2 (alignment))
|
|
|
|
{
|
|
|
|
size_t a = MALLOC_ALIGNMENT * 2;
|
|
|
|
while (a < alignment)
|
|
|
|
a <<= 1;
|
|
|
|
alignment = a;
|
|
|
|
}
|
2013-11-20 14:46:02 +00:00
|
|
|
|
2017-10-24 11:39:24 +00:00
|
|
|
if (SINGLE_THREAD_P)
|
|
|
|
{
|
|
|
|
p = _int_memalign (&main_arena, alignment, bytes);
|
|
|
|
assert (!p || chunk_is_mmapped (mem2chunk (p)) ||
|
|
|
|
&main_arena == arena_for_chunk (mem2chunk (p)));
|
2021-02-16 14:12:25 +00:00
|
|
|
return tag_new_usable (p);
|
2017-10-24 11:39:24 +00:00
|
|
|
}
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
arena_get (ar_ptr, bytes + alignment + MINSIZE);
|
|
|
|
|
|
|
|
p = _int_memalign (ar_ptr, alignment, bytes);
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
if (!p && ar_ptr != NULL)
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_memalign_retry, 2, bytes, alignment);
|
|
|
|
ar_ptr = arena_get_retry (ar_ptr, bytes);
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
p = _int_memalign (ar_ptr, alignment, bytes);
|
1996-12-08 08:01:13 +00:00
|
|
|
}
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
|
|
|
|
if (ar_ptr != NULL)
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_unlock (ar_ptr->mutex);
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
assert (!p || chunk_is_mmapped (mem2chunk (p)) ||
|
|
|
|
ar_ptr == arena_for_chunk (mem2chunk (p)));
|
2021-02-16 14:12:25 +00:00
|
|
|
return tag_new_usable (p);
|
1996-12-08 08:01:13 +00:00
|
|
|
}
|
2011-12-24 04:49:48 +00:00
|
|
|
/* For ISO C11. */
|
2012-01-31 23:49:22 +00:00
|
|
|
weak_alias (__libc_memalign, aligned_alloc)
|
|
|
|
libc_hidden_def (__libc_memalign)
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
void *
|
|
|
|
__libc_valloc (size_t bytes)
|
2002-01-29 07:54:51 +00:00
|
|
|
{
|
2014-01-02 08:38:18 +00:00
|
|
|
if (__malloc_initialized < 0)
|
2002-01-29 07:54:51 +00:00
|
|
|
ptmalloc_init ();
|
2004-10-01 23:51:18 +00:00
|
|
|
|
2013-11-20 14:46:02 +00:00
|
|
|
void *address = RETURN_ADDRESS (0);
|
2015-02-18 00:25:01 +00:00
|
|
|
size_t pagesize = GLRO (dl_pagesize);
|
2021-03-12 14:30:10 +00:00
|
|
|
return _mid_memalign (pagesize, bytes, address);
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
void *
|
|
|
|
__libc_pvalloc (size_t bytes)
|
2002-01-29 07:54:51 +00:00
|
|
|
{
|
2014-01-02 08:38:18 +00:00
|
|
|
if (__malloc_initialized < 0)
|
2002-01-29 07:54:51 +00:00
|
|
|
ptmalloc_init ();
|
2004-10-01 23:51:18 +00:00
|
|
|
|
2013-11-20 14:46:02 +00:00
|
|
|
void *address = RETURN_ADDRESS (0);
|
2015-02-18 00:25:01 +00:00
|
|
|
size_t pagesize = GLRO (dl_pagesize);
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
size_t rounded_bytes;
|
|
|
|
/* ALIGN_UP with overflow check. */
|
|
|
|
if (__glibc_unlikely (__builtin_add_overflow (bytes,
|
|
|
|
pagesize - 1,
|
|
|
|
&rounded_bytes)))
|
2013-08-12 14:08:02 +00:00
|
|
|
{
|
|
|
|
__set_errno (ENOMEM);
|
|
|
|
return 0;
|
|
|
|
}
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
rounded_bytes = rounded_bytes & -(pagesize - 1);
|
2013-08-12 14:08:02 +00:00
|
|
|
|
2021-03-12 14:30:10 +00:00
|
|
|
return _mid_memalign (pagesize, rounded_bytes, address);
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
void *
|
|
|
|
__libc_calloc (size_t n, size_t elem_size)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2014-03-03 17:28:25 +00:00
|
|
|
mstate av;
|
2020-12-21 15:03:03 +00:00
|
|
|
mchunkptr oldtop;
|
|
|
|
INTERNAL_SIZE_T sz, oldtopsize;
|
2014-01-02 08:38:18 +00:00
|
|
|
void *mem;
|
2014-03-03 17:28:25 +00:00
|
|
|
unsigned long clearsize;
|
|
|
|
unsigned long nclears;
|
|
|
|
INTERNAL_SIZE_T *d;
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
ptrdiff_t bytes;
|
2002-08-02 01:27:46 +00:00
|
|
|
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
if (__glibc_unlikely (__builtin_mul_overflow (n, elem_size, &bytes)))
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
__set_errno (ENOMEM);
|
|
|
|
return NULL;
|
2002-08-03 18:59:41 +00:00
|
|
|
}
|
2020-12-21 15:03:03 +00:00
|
|
|
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
sz = bytes;
|
2002-08-02 01:27:46 +00:00
|
|
|
|
2013-03-08 21:27:42 +00:00
|
|
|
void *(*hook) (size_t, const void *) =
|
2013-12-09 16:14:12 +00:00
|
|
|
atomic_forced_read (__malloc_hook);
|
2014-01-02 08:38:18 +00:00
|
|
|
if (__builtin_expect (hook != NULL, 0))
|
|
|
|
{
|
2014-03-03 17:28:25 +00:00
|
|
|
mem = (*hook)(sz, RETURN_ADDRESS (0));
|
|
|
|
if (mem == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return memset (mem, 0, sz);
|
1997-04-15 01:38:39 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-07-06 17:37:30 +00:00
|
|
|
MAYBE_INIT_TCACHE ();
|
|
|
|
|
2017-10-24 11:39:24 +00:00
|
|
|
if (SINGLE_THREAD_P)
|
|
|
|
av = &main_arena;
|
|
|
|
else
|
|
|
|
arena_get (av, sz);
|
|
|
|
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
if (av)
|
|
|
|
{
|
|
|
|
/* Check if we hand out the top chunk, in which case there may be no
|
|
|
|
need to clear. */
|
2014-03-03 17:28:25 +00:00
|
|
|
#if MORECORE_CLEARS
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
oldtop = top (av);
|
|
|
|
oldtopsize = chunksize (top (av));
|
2014-03-03 17:28:25 +00:00
|
|
|
# if MORECORE_CLEARS < 2
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
/* Only newly allocated memory is guaranteed to be cleared. */
|
|
|
|
if (av == &main_arena &&
|
|
|
|
oldtopsize < mp_.sbrk_base + av->max_system_mem - (char *) oldtop)
|
|
|
|
oldtopsize = (mp_.sbrk_base + av->max_system_mem - (char *) oldtop);
|
2014-03-03 17:28:25 +00:00
|
|
|
# endif
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
if (av != &main_arena)
|
|
|
|
{
|
|
|
|
heap_info *heap = heap_for_ptr (oldtop);
|
|
|
|
if (oldtopsize < (char *) heap + heap->mprotect_size - (char *) oldtop)
|
|
|
|
oldtopsize = (char *) heap + heap->mprotect_size - (char *) oldtop;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else
|
2014-03-03 17:28:25 +00:00
|
|
|
{
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
/* No usable arenas. */
|
|
|
|
oldtop = 0;
|
|
|
|
oldtopsize = 0;
|
2014-03-03 17:28:25 +00:00
|
|
|
}
|
|
|
|
mem = _int_malloc (av, sz);
|
|
|
|
|
|
|
|
assert (!mem || chunk_is_mmapped (mem2chunk (mem)) ||
|
|
|
|
av == arena_for_chunk (mem2chunk (mem)));
|
|
|
|
|
2017-10-24 11:39:24 +00:00
|
|
|
if (!SINGLE_THREAD_P)
|
2014-03-03 17:28:25 +00:00
|
|
|
{
|
2017-10-24 11:39:24 +00:00
|
|
|
if (mem == 0 && av != NULL)
|
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_calloc_retry, 1, sz);
|
|
|
|
av = arena_get_retry (av, sz);
|
|
|
|
mem = _int_malloc (av, sz);
|
|
|
|
}
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
|
2017-10-24 11:39:24 +00:00
|
|
|
if (av != NULL)
|
|
|
|
__libc_lock_unlock (av->mutex);
|
|
|
|
}
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
|
|
|
|
/* Allocation failed even after a retry. */
|
|
|
|
if (mem == 0)
|
|
|
|
return 0;
|
|
|
|
|
2020-12-21 15:03:03 +00:00
|
|
|
mchunkptr p = mem2chunk (mem);
|
2021-02-16 17:02:44 +00:00
|
|
|
|
2020-12-21 15:03:03 +00:00
|
|
|
/* If we are using memory tagging, then we need to set the tags
|
|
|
|
regardless of MORECORE_CLEARS, so we zero the whole block while
|
|
|
|
doing so. */
|
2021-02-16 17:02:44 +00:00
|
|
|
if (__glibc_unlikely (mtag_enabled))
|
2021-03-08 12:59:05 +00:00
|
|
|
return tag_new_zero_region (mem, memsize (p));
|
2021-02-16 17:02:44 +00:00
|
|
|
|
2020-12-21 15:03:03 +00:00
|
|
|
INTERNAL_SIZE_T csz = chunksize (p);
|
2014-03-03 17:28:25 +00:00
|
|
|
|
|
|
|
/* Two optional cases in which clearing not necessary */
|
|
|
|
if (chunk_is_mmapped (p))
|
|
|
|
{
|
|
|
|
if (__builtin_expect (perturb_byte, 0))
|
|
|
|
return memset (mem, 0, sz);
|
|
|
|
|
|
|
|
return mem;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if MORECORE_CLEARS
|
|
|
|
if (perturb_byte == 0 && (p == oldtop && csz > oldtopsize))
|
|
|
|
{
|
|
|
|
/* clear only the bytes from non-freshly-sbrked memory */
|
|
|
|
csz = oldtopsize;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Unroll clear of <= 36 bytes (72 if 8byte sizes). We know that
|
|
|
|
contents have an odd number of INTERNAL_SIZE_T-sized words;
|
|
|
|
minimally 3. */
|
|
|
|
d = (INTERNAL_SIZE_T *) mem;
|
|
|
|
clearsize = csz - SIZE_SZ;
|
|
|
|
nclears = clearsize / sizeof (INTERNAL_SIZE_T);
|
|
|
|
assert (nclears >= 3);
|
|
|
|
|
|
|
|
if (nclears > 9)
|
|
|
|
return memset (d, 0, clearsize);
|
|
|
|
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*(d + 0) = 0;
|
|
|
|
*(d + 1) = 0;
|
|
|
|
*(d + 2) = 0;
|
|
|
|
if (nclears > 4)
|
|
|
|
{
|
|
|
|
*(d + 3) = 0;
|
|
|
|
*(d + 4) = 0;
|
|
|
|
if (nclears > 6)
|
|
|
|
{
|
|
|
|
*(d + 5) = 0;
|
|
|
|
*(d + 6) = 0;
|
|
|
|
if (nclears > 8)
|
|
|
|
{
|
|
|
|
*(d + 7) = 0;
|
|
|
|
*(d + 8) = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return mem;
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
------------------------------ malloc ------------------------------
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static void *
|
|
|
|
_int_malloc (mstate av, size_t bytes)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
INTERNAL_SIZE_T nb; /* normalized request size */
|
2014-01-02 08:38:18 +00:00
|
|
|
unsigned int idx; /* associated bin index */
|
|
|
|
mbinptr bin; /* associated bin */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
mchunkptr victim; /* inspected/selected chunk */
|
2002-01-29 07:54:51 +00:00
|
|
|
INTERNAL_SIZE_T size; /* its size */
|
2014-01-02 08:38:18 +00:00
|
|
|
int victim_index; /* its bin index */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
mchunkptr remainder; /* remainder from a split */
|
|
|
|
unsigned long remainder_size; /* its size */
|
1996-12-10 03:08:06 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
unsigned int block; /* bit map traverser */
|
|
|
|
unsigned int bit; /* bit map traverser */
|
|
|
|
unsigned int map; /* current word of binmap */
|
1996-12-10 03:08:06 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
mchunkptr fwd; /* misc temp for linking */
|
|
|
|
mchunkptr bck; /* misc temp for linking */
|
1996-12-10 03:08:06 +00:00
|
|
|
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
size_t tcache_unsorted_count; /* count of unsorted chunks processed */
|
|
|
|
#endif
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Convert request size to internal form by adding SIZE_SZ bytes
|
|
|
|
overhead plus possibly more to obtain necessary alignment and/or
|
|
|
|
to obtain a size of at least MINSIZE, the smallest allocatable
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
size. Also, checked_request2size returns false for request sizes
|
2014-01-02 08:38:18 +00:00
|
|
|
that are so large that they wrap around zero when padded and
|
|
|
|
aligned.
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
if (!checked_request2size (bytes, &nb))
|
|
|
|
{
|
|
|
|
__set_errno (ENOMEM);
|
|
|
|
return NULL;
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
Avoid deadlock in malloc on backtrace (BZ #16159)
When the malloc subsystem detects some kind of memory corruption,
depending on the configuration it prints the error, a backtrace, a
memory map and then aborts the process. In this process, the
backtrace() call may result in a call to malloc, resulting in
various kinds of problematic behavior.
In one case, the malloc it calls may detect a corruption and call
backtrace again, and a stack overflow may result due to the infinite
recursion. In another case, the malloc it calls may deadlock on an
arena lock with the malloc (or free, realloc, etc.) that detected the
corruption. In yet another case, if the program is linked with
pthreads, backtrace may do a pthread_once initialization, which
deadlocks on itself.
In all these cases, the program exit is not as intended. This is
avoidable by marking the arena that malloc detected a corruption on,
as unusable. The following patch does that. Features of this patch
are as follows:
- A flag is added to the mstate struct of the arena to indicate if the
arena is corrupt.
- The flag is checked whenever malloc functions try to get a lock on
an arena. If the arena is unusable, a NULL is returned, causing the
malloc to use mmap or try the next arena.
- malloc_printerr sets the corrupt flag on the arena when it detects a
corruption
- free does not concern itself with the flag at all. It is not
important since the backtrace workflow does not need free. A free
in a parallel thread may cause another corruption, but that's not
new
- The flag check and set are not atomic and may race. This is fine
since we don't care about contention during the flag check. We want
to make sure that the malloc call in the backtrace does not trip on
itself and all that action happens in the same thread and not across
threads.
I verified that the test case does not show any regressions due to
this patch. I also ran the malloc benchmarks and found an
insignificant difference in timings (< 2%).
* malloc/Makefile (tests): New test case tst-malloc-backtrace.
* malloc/arena.c (arena_lock): Check if arena is corrupt.
(reused_arena): Find a non-corrupt arena.
(heap_trim): Pass arena to unlink.
* malloc/hooks.c (malloc_check_get_size): Pass arena to
malloc_printerr.
(top_check): Likewise.
(free_check): Likewise.
(realloc_check): Likewise.
* malloc/malloc.c (malloc_printerr): Add arena argument.
(unlink): Likewise.
(munmap_chunk): Adjust.
(ARENA_CORRUPTION_BIT): New macro.
(arena_is_corrupt): Likewise.
(set_arena_corrupt): Likewise.
(sysmalloc): Use mmap if there are no usable arenas.
(_int_malloc): Likewise.
(__libc_malloc): Don't fail if arena_get returns NULL.
(_mid_memalign): Likewise.
(__libc_calloc): Likewise.
(__libc_realloc): Adjust for additional argument to
malloc_printerr.
(_int_free): Likewise.
(malloc_consolidate): Likewise.
(_int_realloc): Likewise.
(_int_memalign): Don't touch corrupt arenas.
* malloc/tst-malloc-backtrace.c: New test case.
2015-05-19 01:10:37 +00:00
|
|
|
/* There are no usable arenas. Fall back to sysmalloc to get a chunk from
|
|
|
|
mmap. */
|
|
|
|
if (__glibc_unlikely (av == NULL))
|
|
|
|
{
|
|
|
|
void *p = sysmalloc (nb, av);
|
|
|
|
if (p != NULL)
|
|
|
|
alloc_perturb (p, bytes);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
If the size qualifies as a fastbin, first check corresponding bin.
|
|
|
|
This code is safe to execute even if av is not yet initialized, so we
|
|
|
|
can try it without checking, which saves some time on this fast path.
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2019-01-18 21:38:32 +00:00
|
|
|
#define REMOVE_FB(fb, victim, pp) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
victim = pp; \
|
|
|
|
if (victim == NULL) \
|
|
|
|
break; \
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
pp = REVEAL_PTR (victim->fd); \
|
2020-03-31 06:00:14 +00:00
|
|
|
if (__glibc_unlikely (pp != NULL && misaligned_chunk (pp))) \
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
malloc_printerr ("malloc(): unaligned fastbin chunk detected"); \
|
2019-01-18 21:38:32 +00:00
|
|
|
} \
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
while ((pp = catomic_compare_and_exchange_val_acq (fb, pp, victim)) \
|
2019-01-18 21:38:32 +00:00
|
|
|
!= victim); \
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if ((unsigned long) (nb) <= (unsigned long) (get_max_fast ()))
|
|
|
|
{
|
|
|
|
idx = fastbin_index (nb);
|
|
|
|
mfastbinptr *fb = &fastbin (av, idx);
|
2019-01-18 21:38:32 +00:00
|
|
|
mchunkptr pp;
|
|
|
|
victim = *fb;
|
|
|
|
|
2017-10-24 11:43:05 +00:00
|
|
|
if (victim != NULL)
|
|
|
|
{
|
2020-03-31 06:00:14 +00:00
|
|
|
if (__glibc_unlikely (misaligned_chunk (victim)))
|
|
|
|
malloc_printerr ("malloc(): unaligned fastbin chunk detected 2");
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
|
2019-01-18 21:38:32 +00:00
|
|
|
if (SINGLE_THREAD_P)
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
*fb = REVEAL_PTR (victim->fd);
|
2019-01-18 21:38:32 +00:00
|
|
|
else
|
|
|
|
REMOVE_FB (fb, pp, victim);
|
|
|
|
if (__glibc_likely (victim != NULL))
|
2018-11-13 09:36:09 +00:00
|
|
|
{
|
2019-01-18 21:38:32 +00:00
|
|
|
size_t victim_idx = fastbin_index (chunksize (victim));
|
|
|
|
if (__builtin_expect (victim_idx != idx, 0))
|
|
|
|
malloc_printerr ("malloc(): memory corruption (fast)");
|
|
|
|
check_remalloced_chunk (av, victim, nb);
|
|
|
|
#if USE_TCACHE
|
|
|
|
/* While we're here, if we see other chunks of the same size,
|
|
|
|
stash them in the tcache. */
|
|
|
|
size_t tc_idx = csize2tidx (nb);
|
|
|
|
if (tcache && tc_idx < mp_.tcache_bins)
|
2017-07-06 17:37:30 +00:00
|
|
|
{
|
2019-01-18 21:38:32 +00:00
|
|
|
mchunkptr tc_victim;
|
|
|
|
|
|
|
|
/* While bin not empty and tcache not full, copy chunks. */
|
|
|
|
while (tcache->counts[tc_idx] < mp_.tcache_count
|
|
|
|
&& (tc_victim = *fb) != NULL)
|
|
|
|
{
|
2020-03-31 06:00:14 +00:00
|
|
|
if (__glibc_unlikely (misaligned_chunk (tc_victim)))
|
|
|
|
malloc_printerr ("malloc(): unaligned fastbin chunk detected 3");
|
2019-01-18 21:38:32 +00:00
|
|
|
if (SINGLE_THREAD_P)
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
*fb = REVEAL_PTR (tc_victim->fd);
|
2019-01-18 21:38:32 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
REMOVE_FB (fb, pp, tc_victim);
|
|
|
|
if (__glibc_unlikely (tc_victim == NULL))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
tcache_put (tc_victim, tc_idx);
|
|
|
|
}
|
2017-07-06 17:37:30 +00:00
|
|
|
}
|
2018-11-13 09:36:09 +00:00
|
|
|
#endif
|
2021-03-11 14:49:45 +00:00
|
|
|
void *p = chunk2mem (victim);
|
2019-01-18 21:38:32 +00:00
|
|
|
alloc_perturb (p, bytes);
|
|
|
|
return p;
|
|
|
|
}
|
2017-10-24 11:43:05 +00:00
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
If a small request, check regular bin. Since these "smallbins"
|
|
|
|
hold one size each, no searching within bins is necessary.
|
|
|
|
(For a large request, we need to wait until unsorted chunks are
|
|
|
|
processed to find best fit. But for small ones, fits are exact
|
|
|
|
anyway, so we can check now, which is faster.)
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (in_smallbin_range (nb))
|
|
|
|
{
|
|
|
|
idx = smallbin_index (nb);
|
|
|
|
bin = bin_at (av, idx);
|
|
|
|
|
|
|
|
if ((victim = last (bin)) != bin)
|
|
|
|
{
|
2017-10-17 17:55:16 +00:00
|
|
|
bck = victim->bk;
|
|
|
|
if (__glibc_unlikely (bck->fd != victim))
|
|
|
|
malloc_printerr ("malloc(): smallbin double linked list corrupted");
|
|
|
|
set_inuse_bit_at_offset (victim, nb);
|
|
|
|
bin->bk = bck;
|
|
|
|
bck->fd = bin;
|
|
|
|
|
|
|
|
if (av != &main_arena)
|
|
|
|
set_non_main_arena (victim);
|
|
|
|
check_malloced_chunk (av, victim, nb);
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
/* While we're here, if we see other chunks of the same size,
|
|
|
|
stash them in the tcache. */
|
|
|
|
size_t tc_idx = csize2tidx (nb);
|
|
|
|
if (tcache && tc_idx < mp_.tcache_bins)
|
|
|
|
{
|
|
|
|
mchunkptr tc_victim;
|
|
|
|
|
|
|
|
/* While bin not empty and tcache not full, copy chunks over. */
|
|
|
|
while (tcache->counts[tc_idx] < mp_.tcache_count
|
|
|
|
&& (tc_victim = last (bin)) != bin)
|
|
|
|
{
|
|
|
|
if (tc_victim != 0)
|
|
|
|
{
|
|
|
|
bck = tc_victim->bk;
|
|
|
|
set_inuse_bit_at_offset (tc_victim, nb);
|
|
|
|
if (av != &main_arena)
|
|
|
|
set_non_main_arena (tc_victim);
|
|
|
|
bin->bk = bck;
|
|
|
|
bck->fd = bin;
|
|
|
|
|
|
|
|
tcache_put (tc_victim, tc_idx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2021-03-11 14:49:45 +00:00
|
|
|
void *p = chunk2mem (victim);
|
2017-10-17 17:55:16 +00:00
|
|
|
alloc_perturb (p, bytes);
|
|
|
|
return p;
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
/*
|
2002-01-29 07:54:51 +00:00
|
|
|
If this is a large request, consolidate fastbins before continuing.
|
|
|
|
While it might look excessive to kill all fastbins before
|
|
|
|
even seeing if there is space available, this avoids
|
|
|
|
fragmentation problems normally associated with fastbins.
|
|
|
|
Also, in practice, programs tend to have runs of either small or
|
2002-02-07 05:30:48 +00:00
|
|
|
large requests, but less often mixtures, so consolidation is not
|
2002-01-29 07:54:51 +00:00
|
|
|
invoked all that often in most programs. And the programs that
|
|
|
|
it is called frequently in otherwise tend to fragment.
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1997-04-15 01:38:39 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
idx = largebin_index (nb);
|
2017-10-17 17:43:31 +00:00
|
|
|
if (atomic_load_relaxed (&av->have_fastchunks))
|
2014-01-02 08:38:18 +00:00
|
|
|
malloc_consolidate (av);
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Process recently freed or remaindered chunks, taking one only if
|
|
|
|
it is exact fit, or, if this a small request, the chunk is remainder from
|
|
|
|
the most recent non-exact fit. Place other traversed chunks in
|
|
|
|
bins. Note that this step is the only place in any routine where
|
|
|
|
chunks are placed in bins.
|
|
|
|
|
|
|
|
The outer loop here is needed because we might not realize until
|
|
|
|
near the end of malloc that we should have consolidated, so must
|
|
|
|
do so and retry. This happens at most once, and only when we would
|
|
|
|
otherwise need to expand memory to service a "small" request.
|
|
|
|
*/
|
|
|
|
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
INTERNAL_SIZE_T tcache_nb = 0;
|
|
|
|
size_t tc_idx = csize2tidx (nb);
|
|
|
|
if (tcache && tc_idx < mp_.tcache_bins)
|
|
|
|
tcache_nb = nb;
|
|
|
|
int return_cached = 0;
|
|
|
|
|
|
|
|
tcache_unsorted_count = 0;
|
|
|
|
#endif
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
for (;; )
|
|
|
|
{
|
|
|
|
int iters = 0;
|
|
|
|
while ((victim = unsorted_chunks (av)->bk) != unsorted_chunks (av))
|
|
|
|
{
|
|
|
|
bck = victim->bk;
|
|
|
|
size = chunksize (victim);
|
malloc: Additional checks for unsorted bin integrity I.
On Thu, Jan 11, 2018 at 3:50 PM, Florian Weimer <fweimer@redhat.com> wrote:
> On 11/07/2017 04:27 PM, Istvan Kurucsai wrote:
>>
>> + next = chunk_at_offset (victim, size);
>
>
> For new code, we prefer declarations with initializers.
Noted.
>> + if (__glibc_unlikely (chunksize_nomask (victim) <= 2 * SIZE_SZ)
>> + || __glibc_unlikely (chunksize_nomask (victim) >
>> av->system_mem))
>> + malloc_printerr("malloc(): invalid size (unsorted)");
>> + if (__glibc_unlikely (chunksize_nomask (next) < 2 * SIZE_SZ)
>> + || __glibc_unlikely (chunksize_nomask (next) >
>> av->system_mem))
>> + malloc_printerr("malloc(): invalid next size (unsorted)");
>> + if (__glibc_unlikely ((prev_size (next) & ~(SIZE_BITS)) !=
>> size))
>> + malloc_printerr("malloc(): mismatching next->prev_size
>> (unsorted)");
>
>
> I think this check is redundant because prev_size (next) and chunksize
> (victim) are loaded from the same memory location.
I'm fairly certain that it compares mchunk_size of victim against
mchunk_prev_size of the next chunk, i.e. the size of victim in its
header and footer.
>> + if (__glibc_unlikely (bck->fd != victim)
>> + || __glibc_unlikely (victim->fd != unsorted_chunks (av)))
>> + malloc_printerr("malloc(): unsorted double linked list
>> corrupted");
>> + if (__glibc_unlikely (prev_inuse(next)))
>> + malloc_printerr("malloc(): invalid next->prev_inuse
>> (unsorted)");
>
>
> There's a missing space after malloc_printerr.
Noted.
> Why do you keep using chunksize_nomask? We never investigated why the
> original code uses it. It may have been an accident.
You are right, I don't think it makes a difference in these checks. So
the size local can be reused for the checks against victim. For next,
leaving it as such avoids the masking operation.
> Again, for non-main arenas, the checks against av->system_mem could be made
> tighter (against the heap size). Maybe you could put the condition into a
> separate inline function?
We could also do a chunk boundary check similar to what I proposed in
the thread for the first patch in the series to be even more strict.
I'll gladly try to implement either but believe that refining these
checks would bring less benefits than in the case of the top chunk.
Intra-arena or intra-heap overlaps would still be doable here with
unsorted chunks and I don't see any way to counter that besides more
generic measures like randomizing allocations and your metadata
encoding patches.
I've attached a revised version with the above comments incorporated
but without the refined checks.
Thanks,
Istvan
From a12d5d40fd7aed5fa10fc444dcb819947b72b315 Mon Sep 17 00:00:00 2001
From: Istvan Kurucsai <pistukem@gmail.com>
Date: Tue, 16 Jan 2018 14:48:16 +0100
Subject: [PATCH v2 1/1] malloc: Additional checks for unsorted bin integrity
I.
Ensure the following properties of chunks encountered during binning:
- victim chunk has reasonable size
- next chunk has reasonable size
- next->prev_size == victim->size
- valid double linked list
- PREV_INUSE of next chunk is unset
* malloc/malloc.c (_int_malloc): Additional binning code checks.
2018-01-16 13:54:32 +00:00
|
|
|
mchunkptr next = chunk_at_offset (victim, size);
|
|
|
|
|
2020-12-21 15:03:03 +00:00
|
|
|
if (__glibc_unlikely (size <= CHUNK_HDR_SZ)
|
malloc: Additional checks for unsorted bin integrity I.
On Thu, Jan 11, 2018 at 3:50 PM, Florian Weimer <fweimer@redhat.com> wrote:
> On 11/07/2017 04:27 PM, Istvan Kurucsai wrote:
>>
>> + next = chunk_at_offset (victim, size);
>
>
> For new code, we prefer declarations with initializers.
Noted.
>> + if (__glibc_unlikely (chunksize_nomask (victim) <= 2 * SIZE_SZ)
>> + || __glibc_unlikely (chunksize_nomask (victim) >
>> av->system_mem))
>> + malloc_printerr("malloc(): invalid size (unsorted)");
>> + if (__glibc_unlikely (chunksize_nomask (next) < 2 * SIZE_SZ)
>> + || __glibc_unlikely (chunksize_nomask (next) >
>> av->system_mem))
>> + malloc_printerr("malloc(): invalid next size (unsorted)");
>> + if (__glibc_unlikely ((prev_size (next) & ~(SIZE_BITS)) !=
>> size))
>> + malloc_printerr("malloc(): mismatching next->prev_size
>> (unsorted)");
>
>
> I think this check is redundant because prev_size (next) and chunksize
> (victim) are loaded from the same memory location.
I'm fairly certain that it compares mchunk_size of victim against
mchunk_prev_size of the next chunk, i.e. the size of victim in its
header and footer.
>> + if (__glibc_unlikely (bck->fd != victim)
>> + || __glibc_unlikely (victim->fd != unsorted_chunks (av)))
>> + malloc_printerr("malloc(): unsorted double linked list
>> corrupted");
>> + if (__glibc_unlikely (prev_inuse(next)))
>> + malloc_printerr("malloc(): invalid next->prev_inuse
>> (unsorted)");
>
>
> There's a missing space after malloc_printerr.
Noted.
> Why do you keep using chunksize_nomask? We never investigated why the
> original code uses it. It may have been an accident.
You are right, I don't think it makes a difference in these checks. So
the size local can be reused for the checks against victim. For next,
leaving it as such avoids the masking operation.
> Again, for non-main arenas, the checks against av->system_mem could be made
> tighter (against the heap size). Maybe you could put the condition into a
> separate inline function?
We could also do a chunk boundary check similar to what I proposed in
the thread for the first patch in the series to be even more strict.
I'll gladly try to implement either but believe that refining these
checks would bring less benefits than in the case of the top chunk.
Intra-arena or intra-heap overlaps would still be doable here with
unsorted chunks and I don't see any way to counter that besides more
generic measures like randomizing allocations and your metadata
encoding patches.
I've attached a revised version with the above comments incorporated
but without the refined checks.
Thanks,
Istvan
From a12d5d40fd7aed5fa10fc444dcb819947b72b315 Mon Sep 17 00:00:00 2001
From: Istvan Kurucsai <pistukem@gmail.com>
Date: Tue, 16 Jan 2018 14:48:16 +0100
Subject: [PATCH v2 1/1] malloc: Additional checks for unsorted bin integrity
I.
Ensure the following properties of chunks encountered during binning:
- victim chunk has reasonable size
- next chunk has reasonable size
- next->prev_size == victim->size
- valid double linked list
- PREV_INUSE of next chunk is unset
* malloc/malloc.c (_int_malloc): Additional binning code checks.
2018-01-16 13:54:32 +00:00
|
|
|
|| __glibc_unlikely (size > av->system_mem))
|
|
|
|
malloc_printerr ("malloc(): invalid size (unsorted)");
|
2020-12-21 15:03:03 +00:00
|
|
|
if (__glibc_unlikely (chunksize_nomask (next) < CHUNK_HDR_SZ)
|
malloc: Additional checks for unsorted bin integrity I.
On Thu, Jan 11, 2018 at 3:50 PM, Florian Weimer <fweimer@redhat.com> wrote:
> On 11/07/2017 04:27 PM, Istvan Kurucsai wrote:
>>
>> + next = chunk_at_offset (victim, size);
>
>
> For new code, we prefer declarations with initializers.
Noted.
>> + if (__glibc_unlikely (chunksize_nomask (victim) <= 2 * SIZE_SZ)
>> + || __glibc_unlikely (chunksize_nomask (victim) >
>> av->system_mem))
>> + malloc_printerr("malloc(): invalid size (unsorted)");
>> + if (__glibc_unlikely (chunksize_nomask (next) < 2 * SIZE_SZ)
>> + || __glibc_unlikely (chunksize_nomask (next) >
>> av->system_mem))
>> + malloc_printerr("malloc(): invalid next size (unsorted)");
>> + if (__glibc_unlikely ((prev_size (next) & ~(SIZE_BITS)) !=
>> size))
>> + malloc_printerr("malloc(): mismatching next->prev_size
>> (unsorted)");
>
>
> I think this check is redundant because prev_size (next) and chunksize
> (victim) are loaded from the same memory location.
I'm fairly certain that it compares mchunk_size of victim against
mchunk_prev_size of the next chunk, i.e. the size of victim in its
header and footer.
>> + if (__glibc_unlikely (bck->fd != victim)
>> + || __glibc_unlikely (victim->fd != unsorted_chunks (av)))
>> + malloc_printerr("malloc(): unsorted double linked list
>> corrupted");
>> + if (__glibc_unlikely (prev_inuse(next)))
>> + malloc_printerr("malloc(): invalid next->prev_inuse
>> (unsorted)");
>
>
> There's a missing space after malloc_printerr.
Noted.
> Why do you keep using chunksize_nomask? We never investigated why the
> original code uses it. It may have been an accident.
You are right, I don't think it makes a difference in these checks. So
the size local can be reused for the checks against victim. For next,
leaving it as such avoids the masking operation.
> Again, for non-main arenas, the checks against av->system_mem could be made
> tighter (against the heap size). Maybe you could put the condition into a
> separate inline function?
We could also do a chunk boundary check similar to what I proposed in
the thread for the first patch in the series to be even more strict.
I'll gladly try to implement either but believe that refining these
checks would bring less benefits than in the case of the top chunk.
Intra-arena or intra-heap overlaps would still be doable here with
unsorted chunks and I don't see any way to counter that besides more
generic measures like randomizing allocations and your metadata
encoding patches.
I've attached a revised version with the above comments incorporated
but without the refined checks.
Thanks,
Istvan
From a12d5d40fd7aed5fa10fc444dcb819947b72b315 Mon Sep 17 00:00:00 2001
From: Istvan Kurucsai <pistukem@gmail.com>
Date: Tue, 16 Jan 2018 14:48:16 +0100
Subject: [PATCH v2 1/1] malloc: Additional checks for unsorted bin integrity
I.
Ensure the following properties of chunks encountered during binning:
- victim chunk has reasonable size
- next chunk has reasonable size
- next->prev_size == victim->size
- valid double linked list
- PREV_INUSE of next chunk is unset
* malloc/malloc.c (_int_malloc): Additional binning code checks.
2018-01-16 13:54:32 +00:00
|
|
|
|| __glibc_unlikely (chunksize_nomask (next) > av->system_mem))
|
|
|
|
malloc_printerr ("malloc(): invalid next size (unsorted)");
|
|
|
|
if (__glibc_unlikely ((prev_size (next) & ~(SIZE_BITS)) != size))
|
|
|
|
malloc_printerr ("malloc(): mismatching next->prev_size (unsorted)");
|
|
|
|
if (__glibc_unlikely (bck->fd != victim)
|
|
|
|
|| __glibc_unlikely (victim->fd != unsorted_chunks (av)))
|
|
|
|
malloc_printerr ("malloc(): unsorted double linked list corrupted");
|
2018-08-20 12:57:13 +00:00
|
|
|
if (__glibc_unlikely (prev_inuse (next)))
|
malloc: Additional checks for unsorted bin integrity I.
On Thu, Jan 11, 2018 at 3:50 PM, Florian Weimer <fweimer@redhat.com> wrote:
> On 11/07/2017 04:27 PM, Istvan Kurucsai wrote:
>>
>> + next = chunk_at_offset (victim, size);
>
>
> For new code, we prefer declarations with initializers.
Noted.
>> + if (__glibc_unlikely (chunksize_nomask (victim) <= 2 * SIZE_SZ)
>> + || __glibc_unlikely (chunksize_nomask (victim) >
>> av->system_mem))
>> + malloc_printerr("malloc(): invalid size (unsorted)");
>> + if (__glibc_unlikely (chunksize_nomask (next) < 2 * SIZE_SZ)
>> + || __glibc_unlikely (chunksize_nomask (next) >
>> av->system_mem))
>> + malloc_printerr("malloc(): invalid next size (unsorted)");
>> + if (__glibc_unlikely ((prev_size (next) & ~(SIZE_BITS)) !=
>> size))
>> + malloc_printerr("malloc(): mismatching next->prev_size
>> (unsorted)");
>
>
> I think this check is redundant because prev_size (next) and chunksize
> (victim) are loaded from the same memory location.
I'm fairly certain that it compares mchunk_size of victim against
mchunk_prev_size of the next chunk, i.e. the size of victim in its
header and footer.
>> + if (__glibc_unlikely (bck->fd != victim)
>> + || __glibc_unlikely (victim->fd != unsorted_chunks (av)))
>> + malloc_printerr("malloc(): unsorted double linked list
>> corrupted");
>> + if (__glibc_unlikely (prev_inuse(next)))
>> + malloc_printerr("malloc(): invalid next->prev_inuse
>> (unsorted)");
>
>
> There's a missing space after malloc_printerr.
Noted.
> Why do you keep using chunksize_nomask? We never investigated why the
> original code uses it. It may have been an accident.
You are right, I don't think it makes a difference in these checks. So
the size local can be reused for the checks against victim. For next,
leaving it as such avoids the masking operation.
> Again, for non-main arenas, the checks against av->system_mem could be made
> tighter (against the heap size). Maybe you could put the condition into a
> separate inline function?
We could also do a chunk boundary check similar to what I proposed in
the thread for the first patch in the series to be even more strict.
I'll gladly try to implement either but believe that refining these
checks would bring less benefits than in the case of the top chunk.
Intra-arena or intra-heap overlaps would still be doable here with
unsorted chunks and I don't see any way to counter that besides more
generic measures like randomizing allocations and your metadata
encoding patches.
I've attached a revised version with the above comments incorporated
but without the refined checks.
Thanks,
Istvan
From a12d5d40fd7aed5fa10fc444dcb819947b72b315 Mon Sep 17 00:00:00 2001
From: Istvan Kurucsai <pistukem@gmail.com>
Date: Tue, 16 Jan 2018 14:48:16 +0100
Subject: [PATCH v2 1/1] malloc: Additional checks for unsorted bin integrity
I.
Ensure the following properties of chunks encountered during binning:
- victim chunk has reasonable size
- next chunk has reasonable size
- next->prev_size == victim->size
- valid double linked list
- PREV_INUSE of next chunk is unset
* malloc/malloc.c (_int_malloc): Additional binning code checks.
2018-01-16 13:54:32 +00:00
|
|
|
malloc_printerr ("malloc(): invalid next->prev_inuse (unsorted)");
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
If a small request, try to use last remainder if it is the
|
|
|
|
only chunk in unsorted bin. This helps promote locality for
|
|
|
|
runs of consecutive small requests. This is the only
|
|
|
|
exception to best-fit, and applies only when there is
|
|
|
|
no exact fit for a small chunk.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (in_smallbin_range (nb) &&
|
|
|
|
bck == unsorted_chunks (av) &&
|
|
|
|
victim == av->last_remainder &&
|
|
|
|
(unsigned long) (size) > (unsigned long) (nb + MINSIZE))
|
|
|
|
{
|
|
|
|
/* split and reattach remainder */
|
|
|
|
remainder_size = size - nb;
|
|
|
|
remainder = chunk_at_offset (victim, nb);
|
|
|
|
unsorted_chunks (av)->bk = unsorted_chunks (av)->fd = remainder;
|
|
|
|
av->last_remainder = remainder;
|
|
|
|
remainder->bk = remainder->fd = unsorted_chunks (av);
|
|
|
|
if (!in_smallbin_range (remainder_size))
|
|
|
|
{
|
|
|
|
remainder->fd_nextsize = NULL;
|
|
|
|
remainder->bk_nextsize = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
set_head (victim, nb | PREV_INUSE |
|
|
|
|
(av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
set_head (remainder, remainder_size | PREV_INUSE);
|
|
|
|
set_foot (remainder, remainder_size);
|
|
|
|
|
|
|
|
check_malloced_chunk (av, victim, nb);
|
2021-03-11 14:49:45 +00:00
|
|
|
void *p = chunk2mem (victim);
|
2014-01-02 08:38:18 +00:00
|
|
|
alloc_perturb (p, bytes);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* remove from unsorted list */
|
2018-03-14 20:25:57 +00:00
|
|
|
if (__glibc_unlikely (bck->fd != victim))
|
|
|
|
malloc_printerr ("malloc(): corrupted unsorted chunks 3");
|
2014-01-02 08:38:18 +00:00
|
|
|
unsorted_chunks (av)->bk = bck;
|
|
|
|
bck->fd = unsorted_chunks (av);
|
|
|
|
|
|
|
|
/* Take now instead of binning if exact fit */
|
|
|
|
|
|
|
|
if (size == nb)
|
|
|
|
{
|
|
|
|
set_inuse_bit_at_offset (victim, size);
|
|
|
|
if (av != &main_arena)
|
2016-10-28 14:26:57 +00:00
|
|
|
set_non_main_arena (victim);
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
/* Fill cache first, return to user only if cache fills.
|
|
|
|
We may return one of these chunks later. */
|
|
|
|
if (tcache_nb
|
|
|
|
&& tcache->counts[tc_idx] < mp_.tcache_count)
|
|
|
|
{
|
|
|
|
tcache_put (victim, tc_idx);
|
|
|
|
return_cached = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
#endif
|
2014-01-02 08:38:18 +00:00
|
|
|
check_malloced_chunk (av, victim, nb);
|
2021-03-11 14:49:45 +00:00
|
|
|
void *p = chunk2mem (victim);
|
2014-01-02 08:38:18 +00:00
|
|
|
alloc_perturb (p, bytes);
|
|
|
|
return p;
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
}
|
|
|
|
#endif
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* place chunk in bin */
|
|
|
|
|
|
|
|
if (in_smallbin_range (size))
|
|
|
|
{
|
|
|
|
victim_index = smallbin_index (size);
|
|
|
|
bck = bin_at (av, victim_index);
|
|
|
|
fwd = bck->fd;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
victim_index = largebin_index (size);
|
|
|
|
bck = bin_at (av, victim_index);
|
|
|
|
fwd = bck->fd;
|
|
|
|
|
|
|
|
/* maintain large bins in sorted order */
|
|
|
|
if (fwd != bck)
|
|
|
|
{
|
|
|
|
/* Or with inuse bit to speed comparisons */
|
|
|
|
size |= PREV_INUSE;
|
|
|
|
/* if smaller than smallest, bypass loop below */
|
2016-10-28 14:26:57 +00:00
|
|
|
assert (chunk_main_arena (bck->bk));
|
|
|
|
if ((unsigned long) (size)
|
|
|
|
< (unsigned long) chunksize_nomask (bck->bk))
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
fwd = bck;
|
|
|
|
bck = bck->bk;
|
|
|
|
|
|
|
|
victim->fd_nextsize = fwd->fd;
|
|
|
|
victim->bk_nextsize = fwd->fd->bk_nextsize;
|
|
|
|
fwd->fd->bk_nextsize = victim->bk_nextsize->fd_nextsize = victim;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-10-28 14:26:57 +00:00
|
|
|
assert (chunk_main_arena (fwd));
|
|
|
|
while ((unsigned long) size < chunksize_nomask (fwd))
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
fwd = fwd->fd_nextsize;
|
2016-10-28 14:26:57 +00:00
|
|
|
assert (chunk_main_arena (fwd));
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
|
|
|
|
2016-10-28 14:26:57 +00:00
|
|
|
if ((unsigned long) size
|
|
|
|
== (unsigned long) chunksize_nomask (fwd))
|
2014-01-02 08:38:18 +00:00
|
|
|
/* Always insert in the second position. */
|
|
|
|
fwd = fwd->fd;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
victim->fd_nextsize = fwd;
|
|
|
|
victim->bk_nextsize = fwd->bk_nextsize;
|
2019-03-14 20:51:16 +00:00
|
|
|
if (__glibc_unlikely (fwd->bk_nextsize->fd_nextsize != fwd))
|
|
|
|
malloc_printerr ("malloc(): largebin double linked list corrupted (nextsize)");
|
2014-01-02 08:38:18 +00:00
|
|
|
fwd->bk_nextsize = victim;
|
|
|
|
victim->bk_nextsize->fd_nextsize = victim;
|
|
|
|
}
|
|
|
|
bck = fwd->bk;
|
2019-03-14 20:51:16 +00:00
|
|
|
if (bck->fd != fwd)
|
|
|
|
malloc_printerr ("malloc(): largebin double linked list corrupted (bk)");
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
victim->fd_nextsize = victim->bk_nextsize = victim;
|
|
|
|
}
|
|
|
|
|
|
|
|
mark_bin (av, victim_index);
|
|
|
|
victim->bk = bck;
|
|
|
|
victim->fd = fwd;
|
|
|
|
fwd->bk = victim;
|
|
|
|
bck->fd = victim;
|
|
|
|
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
/* If we've processed as many chunks as we're allowed while
|
|
|
|
filling the cache, return one of the cached ones. */
|
|
|
|
++tcache_unsorted_count;
|
|
|
|
if (return_cached
|
|
|
|
&& mp_.tcache_unsorted_limit > 0
|
|
|
|
&& tcache_unsorted_count > mp_.tcache_unsorted_limit)
|
|
|
|
{
|
|
|
|
return tcache_get (tc_idx);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
#define MAX_ITERS 10000
|
|
|
|
if (++iters >= MAX_ITERS)
|
|
|
|
break;
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
/* If all the small chunks we found ended up cached, return one now. */
|
|
|
|
if (return_cached)
|
|
|
|
{
|
|
|
|
return tcache_get (tc_idx);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
If a large request, scan through the chunks of current bin in
|
|
|
|
sorted order to find smallest that fits. Use the skip list for this.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (!in_smallbin_range (nb))
|
|
|
|
{
|
|
|
|
bin = bin_at (av, idx);
|
|
|
|
|
|
|
|
/* skip scan if empty or largest chunk is too small */
|
2016-10-28 14:26:57 +00:00
|
|
|
if ((victim = first (bin)) != bin
|
|
|
|
&& (unsigned long) chunksize_nomask (victim)
|
|
|
|
>= (unsigned long) (nb))
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
victim = victim->bk_nextsize;
|
|
|
|
while (((unsigned long) (size = chunksize (victim)) <
|
|
|
|
(unsigned long) (nb)))
|
|
|
|
victim = victim->bk_nextsize;
|
|
|
|
|
|
|
|
/* Avoid removing the first entry for a size so that the skip
|
|
|
|
list does not have to be rerouted. */
|
2016-10-28 14:26:57 +00:00
|
|
|
if (victim != last (bin)
|
|
|
|
&& chunksize_nomask (victim)
|
|
|
|
== chunksize_nomask (victim->fd))
|
2014-01-02 08:38:18 +00:00
|
|
|
victim = victim->fd;
|
|
|
|
|
|
|
|
remainder_size = size - nb;
|
2018-11-12 13:15:14 +00:00
|
|
|
unlink_chunk (av, victim);
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
/* Exhaust */
|
|
|
|
if (remainder_size < MINSIZE)
|
|
|
|
{
|
|
|
|
set_inuse_bit_at_offset (victim, size);
|
|
|
|
if (av != &main_arena)
|
2016-10-28 14:26:57 +00:00
|
|
|
set_non_main_arena (victim);
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
|
|
|
/* Split */
|
|
|
|
else
|
|
|
|
{
|
|
|
|
remainder = chunk_at_offset (victim, nb);
|
|
|
|
/* We cannot assume the unsorted list is empty and therefore
|
|
|
|
have to perform a complete insert here. */
|
|
|
|
bck = unsorted_chunks (av);
|
|
|
|
fwd = bck->fd;
|
2017-08-30 17:29:38 +00:00
|
|
|
if (__glibc_unlikely (fwd->bk != bck))
|
|
|
|
malloc_printerr ("malloc(): corrupted unsorted chunks");
|
2014-01-02 08:38:18 +00:00
|
|
|
remainder->bk = bck;
|
|
|
|
remainder->fd = fwd;
|
|
|
|
bck->fd = remainder;
|
|
|
|
fwd->bk = remainder;
|
|
|
|
if (!in_smallbin_range (remainder_size))
|
|
|
|
{
|
|
|
|
remainder->fd_nextsize = NULL;
|
|
|
|
remainder->bk_nextsize = NULL;
|
|
|
|
}
|
|
|
|
set_head (victim, nb | PREV_INUSE |
|
|
|
|
(av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
set_head (remainder, remainder_size | PREV_INUSE);
|
|
|
|
set_foot (remainder, remainder_size);
|
|
|
|
}
|
|
|
|
check_malloced_chunk (av, victim, nb);
|
2021-03-11 14:49:45 +00:00
|
|
|
void *p = chunk2mem (victim);
|
2014-01-02 08:38:18 +00:00
|
|
|
alloc_perturb (p, bytes);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
/*
|
|
|
|
Search for a chunk by scanning bins, starting with next largest
|
|
|
|
bin. This search is strictly by best-fit; i.e., the smallest
|
|
|
|
(with ties going to approximately the least recently used) chunk
|
|
|
|
that fits is selected.
|
|
|
|
|
|
|
|
The bitmap avoids needing to check that most blocks are nonempty.
|
|
|
|
The particular case of skipping all bins during warm-up phases
|
|
|
|
when no chunks have been returned yet is faster than it might look.
|
|
|
|
*/
|
|
|
|
|
|
|
|
++idx;
|
|
|
|
bin = bin_at (av, idx);
|
|
|
|
block = idx2block (idx);
|
|
|
|
map = av->binmap[block];
|
|
|
|
bit = idx2bit (idx);
|
|
|
|
|
|
|
|
for (;; )
|
|
|
|
{
|
|
|
|
/* Skip rest of block if there are no more set bits in this block. */
|
|
|
|
if (bit > map || bit == 0)
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (++block >= BINMAPSIZE) /* out of bins */
|
|
|
|
goto use_top;
|
|
|
|
}
|
|
|
|
while ((map = av->binmap[block]) == 0);
|
|
|
|
|
|
|
|
bin = bin_at (av, (block << BINMAPSHIFT));
|
|
|
|
bit = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Advance to bin with set bit. There must be one. */
|
|
|
|
while ((bit & map) == 0)
|
|
|
|
{
|
|
|
|
bin = next_bin (bin);
|
|
|
|
bit <<= 1;
|
|
|
|
assert (bit != 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Inspect the bin. It is likely to be non-empty */
|
|
|
|
victim = last (bin);
|
|
|
|
|
|
|
|
/* If a false alarm (empty bin), clear the bit. */
|
|
|
|
if (victim == bin)
|
|
|
|
{
|
|
|
|
av->binmap[block] = map &= ~bit; /* Write through */
|
|
|
|
bin = next_bin (bin);
|
|
|
|
bit <<= 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
{
|
|
|
|
size = chunksize (victim);
|
|
|
|
|
|
|
|
/* We know the first chunk in this bin is big enough to use. */
|
|
|
|
assert ((unsigned long) (size) >= (unsigned long) (nb));
|
|
|
|
|
|
|
|
remainder_size = size - nb;
|
|
|
|
|
|
|
|
/* unlink */
|
2018-11-12 13:15:14 +00:00
|
|
|
unlink_chunk (av, victim);
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
/* Exhaust */
|
|
|
|
if (remainder_size < MINSIZE)
|
|
|
|
{
|
|
|
|
set_inuse_bit_at_offset (victim, size);
|
|
|
|
if (av != &main_arena)
|
2016-10-28 14:26:57 +00:00
|
|
|
set_non_main_arena (victim);
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Split */
|
|
|
|
else
|
|
|
|
{
|
|
|
|
remainder = chunk_at_offset (victim, nb);
|
|
|
|
|
|
|
|
/* We cannot assume the unsorted list is empty and therefore
|
|
|
|
have to perform a complete insert here. */
|
|
|
|
bck = unsorted_chunks (av);
|
|
|
|
fwd = bck->fd;
|
2017-08-30 17:29:38 +00:00
|
|
|
if (__glibc_unlikely (fwd->bk != bck))
|
|
|
|
malloc_printerr ("malloc(): corrupted unsorted chunks 2");
|
2014-01-02 08:38:18 +00:00
|
|
|
remainder->bk = bck;
|
|
|
|
remainder->fd = fwd;
|
|
|
|
bck->fd = remainder;
|
|
|
|
fwd->bk = remainder;
|
|
|
|
|
|
|
|
/* advertise as last remainder */
|
|
|
|
if (in_smallbin_range (nb))
|
|
|
|
av->last_remainder = remainder;
|
|
|
|
if (!in_smallbin_range (remainder_size))
|
|
|
|
{
|
|
|
|
remainder->fd_nextsize = NULL;
|
|
|
|
remainder->bk_nextsize = NULL;
|
|
|
|
}
|
|
|
|
set_head (victim, nb | PREV_INUSE |
|
|
|
|
(av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
set_head (remainder, remainder_size | PREV_INUSE);
|
|
|
|
set_foot (remainder, remainder_size);
|
|
|
|
}
|
|
|
|
check_malloced_chunk (av, victim, nb);
|
2021-03-11 14:49:45 +00:00
|
|
|
void *p = chunk2mem (victim);
|
2014-01-02 08:38:18 +00:00
|
|
|
alloc_perturb (p, bytes);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
use_top:
|
|
|
|
/*
|
|
|
|
If large enough, split off the chunk bordering the end of memory
|
|
|
|
(held in av->top). Note that this is in accord with the best-fit
|
|
|
|
search rule. In effect, av->top is treated as larger (and thus
|
|
|
|
less well fitting) than any other available chunk since it can
|
|
|
|
be extended to be as large as necessary (up to system
|
|
|
|
limitations).
|
|
|
|
|
|
|
|
We require that av->top always exists (i.e., has size >=
|
|
|
|
MINSIZE) after initialization, so if it would otherwise be
|
|
|
|
exhausted by current request, it is replenished. (The main
|
|
|
|
reason for ensuring it exists is that we may need MINSIZE space
|
|
|
|
to put in fenceposts in sysmalloc.)
|
|
|
|
*/
|
|
|
|
|
|
|
|
victim = av->top;
|
|
|
|
size = chunksize (victim);
|
|
|
|
|
2018-08-16 19:24:24 +00:00
|
|
|
if (__glibc_unlikely (size > av->system_mem))
|
|
|
|
malloc_printerr ("malloc(): corrupted top size");
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if ((unsigned long) (size) >= (unsigned long) (nb + MINSIZE))
|
|
|
|
{
|
|
|
|
remainder_size = size - nb;
|
|
|
|
remainder = chunk_at_offset (victim, nb);
|
|
|
|
av->top = remainder;
|
|
|
|
set_head (victim, nb | PREV_INUSE |
|
|
|
|
(av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
set_head (remainder, remainder_size | PREV_INUSE);
|
|
|
|
|
|
|
|
check_malloced_chunk (av, victim, nb);
|
2021-03-11 14:49:45 +00:00
|
|
|
void *p = chunk2mem (victim);
|
2014-01-02 08:38:18 +00:00
|
|
|
alloc_perturb (p, bytes);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* When we are using atomic ops to free fast chunks we can get
|
|
|
|
here for all block sizes. */
|
2017-10-17 17:43:31 +00:00
|
|
|
else if (atomic_load_relaxed (&av->have_fastchunks))
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
malloc_consolidate (av);
|
|
|
|
/* restore original bin index */
|
|
|
|
if (in_smallbin_range (nb))
|
|
|
|
idx = smallbin_index (nb);
|
|
|
|
else
|
|
|
|
idx = largebin_index (nb);
|
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
/*
|
|
|
|
Otherwise, relay to handle system-dependent cases
|
|
|
|
*/
|
2009-03-13 23:53:18 +00:00
|
|
|
else
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
void *p = sysmalloc (nb, av);
|
|
|
|
if (p != NULL)
|
|
|
|
alloc_perturb (p, bytes);
|
|
|
|
return p;
|
|
|
|
}
|
2009-03-13 23:53:18 +00:00
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
------------------------------ free ------------------------------
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2009-02-07 22:01:49 +00:00
|
|
|
static void
|
2014-01-02 08:38:18 +00:00
|
|
|
_int_free (mstate av, mchunkptr p, int have_lock)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
INTERNAL_SIZE_T size; /* its size */
|
2014-01-02 08:38:18 +00:00
|
|
|
mfastbinptr *fb; /* associated fastbin */
|
|
|
|
mchunkptr nextchunk; /* next contiguous chunk */
|
2002-01-29 07:54:51 +00:00
|
|
|
INTERNAL_SIZE_T nextsize; /* its size */
|
2014-01-02 08:38:18 +00:00
|
|
|
int nextinuse; /* true if nextchunk is used */
|
2002-01-29 07:54:51 +00:00
|
|
|
INTERNAL_SIZE_T prevsize; /* size of previous contiguous chunk */
|
2014-01-02 08:38:18 +00:00
|
|
|
mchunkptr bck; /* misc temp for linking */
|
|
|
|
mchunkptr fwd; /* misc temp for linking */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
size = chunksize (p);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
/* Little security check which won't hurt performance: the
|
|
|
|
allocator never wrapps around at the end of the address space.
|
|
|
|
Therefore we can exclude some size values which might appear
|
|
|
|
here by accident or by "design" from some intruder. */
|
2004-12-10 01:36:18 +00:00
|
|
|
if (__builtin_expect ((uintptr_t) p > (uintptr_t) -size, 0)
|
2006-03-02 15:53:19 +00:00
|
|
|
|| __builtin_expect (misaligned_chunk (p), 0))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("free(): invalid pointer");
|
2012-05-25 00:50:28 +00:00
|
|
|
/* We know that each chunk is at least MINSIZE bytes in size or a
|
|
|
|
multiple of MALLOC_ALIGNMENT. */
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (size < MINSIZE || !aligned_OK (size)))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("free(): invalid size");
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
check_inuse_chunk(av, p);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
|
|
|
{
|
|
|
|
size_t tc_idx = csize2tidx (size);
|
2018-11-26 19:06:37 +00:00
|
|
|
if (tcache != NULL && tc_idx < mp_.tcache_bins)
|
2017-07-06 17:37:30 +00:00
|
|
|
{
|
2018-11-26 19:06:37 +00:00
|
|
|
/* Check to see if it's already in the tcache. */
|
2021-03-11 14:49:45 +00:00
|
|
|
tcache_entry *e = (tcache_entry *) chunk2mem (p);
|
2018-11-26 19:06:37 +00:00
|
|
|
|
|
|
|
/* This test succeeds on double free. However, we don't 100%
|
|
|
|
trust it (it also matches random payload data at a 1 in
|
|
|
|
2^<size_t> chance), so verify it's not an unlikely
|
|
|
|
coincidence before aborting. */
|
|
|
|
if (__glibc_unlikely (e->key == tcache))
|
|
|
|
{
|
|
|
|
tcache_entry *tmp;
|
2020-12-11 21:59:10 +00:00
|
|
|
size_t cnt = 0;
|
2018-11-26 19:06:37 +00:00
|
|
|
LIBC_PROBE (memory_tcache_double_free, 2, e, tc_idx);
|
|
|
|
for (tmp = tcache->entries[tc_idx];
|
|
|
|
tmp;
|
2020-12-11 21:59:10 +00:00
|
|
|
tmp = REVEAL_PTR (tmp->next), ++cnt)
|
2020-03-31 05:55:13 +00:00
|
|
|
{
|
2020-12-11 21:59:10 +00:00
|
|
|
if (cnt >= mp_.tcache_count)
|
|
|
|
malloc_printerr ("free(): too many chunks detected in tcache");
|
2020-03-31 05:55:13 +00:00
|
|
|
if (__glibc_unlikely (!aligned_OK (tmp)))
|
|
|
|
malloc_printerr ("free(): unaligned chunk detected in tcache 2");
|
|
|
|
if (tmp == e)
|
|
|
|
malloc_printerr ("free(): double free detected in tcache 2");
|
|
|
|
/* If we get here, it was a coincidence. We've wasted a
|
|
|
|
few cycles, but don't abort. */
|
|
|
|
}
|
2018-11-26 19:06:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (tcache->counts[tc_idx] < mp_.tcache_count)
|
|
|
|
{
|
|
|
|
tcache_put (p, tc_idx);
|
|
|
|
return;
|
|
|
|
}
|
2017-07-06 17:37:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
/*
|
|
|
|
If eligible, place chunk on a fastbin so it can be found
|
|
|
|
and used quickly in malloc.
|
|
|
|
*/
|
2004-09-09 09:03:28 +00:00
|
|
|
|
2005-10-12 20:18:07 +00:00
|
|
|
if ((unsigned long)(size) <= (unsigned long)(get_max_fast ())
|
2004-09-09 09:03:28 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
#if TRIM_FASTBINS
|
|
|
|
/*
|
|
|
|
If TRIM_FASTBINS set, don't place chunks
|
|
|
|
bordering top into fastbins
|
|
|
|
*/
|
|
|
|
&& (chunk_at_offset(p, size) != av->top)
|
|
|
|
#endif
|
|
|
|
) {
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2016-10-28 14:26:57 +00:00
|
|
|
if (__builtin_expect (chunksize_nomask (chunk_at_offset (p, size))
|
2020-12-21 15:03:03 +00:00
|
|
|
<= CHUNK_HDR_SZ, 0)
|
2004-11-19 21:35:00 +00:00
|
|
|
|| __builtin_expect (chunksize (chunk_at_offset (p, size))
|
|
|
|
>= av->system_mem, 0))
|
|
|
|
{
|
2017-10-19 17:19:55 +00:00
|
|
|
bool fail = true;
|
2009-07-16 16:54:34 +00:00
|
|
|
/* We might not have a lock at this point and concurrent modifications
|
2017-10-19 17:19:55 +00:00
|
|
|
of system_mem might result in a false positive. Redo the test after
|
|
|
|
getting the lock. */
|
|
|
|
if (!have_lock)
|
|
|
|
{
|
|
|
|
__libc_lock_lock (av->mutex);
|
2020-12-21 15:03:03 +00:00
|
|
|
fail = (chunksize_nomask (chunk_at_offset (p, size)) <= CHUNK_HDR_SZ
|
2017-10-19 17:19:55 +00:00
|
|
|
|| chunksize (chunk_at_offset (p, size)) >= av->system_mem);
|
|
|
|
__libc_lock_unlock (av->mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fail)
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("free(): invalid next size (fast)");
|
2004-11-19 21:35:00 +00:00
|
|
|
}
|
|
|
|
|
2021-03-11 14:49:45 +00:00
|
|
|
free_perturb (chunk2mem(p), size - CHUNK_HDR_SZ);
|
2009-03-13 23:53:18 +00:00
|
|
|
|
2017-10-17 17:43:31 +00:00
|
|
|
atomic_store_relaxed (&av->have_fastchunks, true);
|
2010-04-03 16:47:01 +00:00
|
|
|
unsigned int idx = fastbin_index(size);
|
|
|
|
fb = &fastbin (av, idx);
|
2009-03-13 23:53:18 +00:00
|
|
|
|
2013-12-23 20:44:50 +00:00
|
|
|
/* Atomically link P to its fastbin: P->FD = *FB; *FB = P; */
|
2019-01-18 21:38:32 +00:00
|
|
|
mchunkptr old = *fb, old2;
|
|
|
|
|
|
|
|
if (SINGLE_THREAD_P)
|
|
|
|
{
|
|
|
|
/* Check that the top of the bin is not the record we are going to
|
|
|
|
add (i.e., double free). */
|
|
|
|
if (__builtin_expect (old == p, 0))
|
|
|
|
malloc_printerr ("double free or corruption (fasttop)");
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
p->fd = PROTECT_PTR (&p->fd, old);
|
2019-01-18 21:38:32 +00:00
|
|
|
*fb = p;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
do
|
|
|
|
{
|
|
|
|
/* Check that the top of the bin is not the record we are going to
|
|
|
|
add (i.e., double free). */
|
|
|
|
if (__builtin_expect (old == p, 0))
|
|
|
|
malloc_printerr ("double free or corruption (fasttop)");
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
old2 = old;
|
|
|
|
p->fd = PROTECT_PTR (&p->fd, old);
|
2019-01-18 21:38:32 +00:00
|
|
|
}
|
|
|
|
while ((old = catomic_compare_and_exchange_val_rel (fb, p, old2))
|
|
|
|
!= old2);
|
2017-10-20 16:27:53 +00:00
|
|
|
|
|
|
|
/* Check that size of fastbin chunk at the top is the same as
|
|
|
|
size of the chunk that we are adding. We can dereference OLD
|
|
|
|
only if we have the lock, otherwise it might have already been
|
|
|
|
allocated again. */
|
|
|
|
if (have_lock && old != NULL
|
|
|
|
&& __builtin_expect (fastbin_index (chunksize (old)) != idx, 0))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("invalid fastbin entry (free)");
|
2004-11-13 05:43:36 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
/*
|
|
|
|
Consolidate other non-mmapped chunks as they arrive.
|
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
else if (!chunk_is_mmapped(p)) {
|
2017-10-20 16:27:53 +00:00
|
|
|
|
|
|
|
/* If we're single-threaded, don't lock the arena. */
|
|
|
|
if (SINGLE_THREAD_P)
|
|
|
|
have_lock = true;
|
|
|
|
|
2017-08-31 12:55:11 +00:00
|
|
|
if (!have_lock)
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_lock (av->mutex);
|
2009-03-13 23:53:18 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
nextchunk = chunk_at_offset(p, size);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
/* Lightweight tests: check whether the block is already the
|
|
|
|
top block. */
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (p == av->top))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("double free or corruption (top)");
|
2004-11-13 05:43:36 +00:00
|
|
|
/* Or whether the next chunk is beyond the boundaries of the arena. */
|
|
|
|
if (__builtin_expect (contiguous (av)
|
|
|
|
&& (char *) nextchunk
|
|
|
|
>= ((char *) av->top + chunksize(av->top)), 0))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("double free or corruption (out)");
|
2004-11-13 05:43:36 +00:00
|
|
|
/* Or whether the block is actually not marked used. */
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (!prev_inuse(nextchunk)))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("double free or corruption (!prev)");
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
nextsize = chunksize(nextchunk);
|
2020-12-21 15:03:03 +00:00
|
|
|
if (__builtin_expect (chunksize_nomask (nextchunk) <= CHUNK_HDR_SZ, 0)
|
2004-11-19 21:35:00 +00:00
|
|
|
|| __builtin_expect (nextsize >= av->system_mem, 0))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("free(): invalid next size (normal)");
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2021-03-11 14:49:45 +00:00
|
|
|
free_perturb (chunk2mem(p), size - CHUNK_HDR_SZ);
|
2005-03-08 00:50:21 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
/* consolidate backward */
|
|
|
|
if (!prev_inuse(p)) {
|
2016-10-28 14:26:57 +00:00
|
|
|
prevsize = prev_size (p);
|
2004-11-13 05:43:36 +00:00
|
|
|
size += prevsize;
|
|
|
|
p = chunk_at_offset(p, -((long) prevsize));
|
2018-08-17 01:08:36 +00:00
|
|
|
if (__glibc_unlikely (chunksize(p) != prevsize))
|
|
|
|
malloc_printerr ("corrupted size vs. prev_size while consolidating");
|
2018-11-12 13:15:14 +00:00
|
|
|
unlink_chunk (av, p);
|
2004-11-13 05:43:36 +00:00
|
|
|
}
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
if (nextchunk != av->top) {
|
|
|
|
/* get and clear inuse bit */
|
|
|
|
nextinuse = inuse_bit_at_offset(nextchunk, nextsize);
|
|
|
|
|
|
|
|
/* consolidate forward */
|
|
|
|
if (!nextinuse) {
|
2018-11-12 13:15:14 +00:00
|
|
|
unlink_chunk (av, nextchunk);
|
2004-11-13 05:43:36 +00:00
|
|
|
size += nextsize;
|
|
|
|
} else
|
|
|
|
clear_inuse_bit_at_offset(nextchunk, 0);
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2004-11-13 05:43:36 +00:00
|
|
|
Place the chunk in unsorted chunk list. Chunks are
|
|
|
|
not placed into regular bins until after they have
|
|
|
|
been given one chance to be used in malloc.
|
2002-01-29 07:54:51 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
bck = unsorted_chunks(av);
|
|
|
|
fwd = bck->fd;
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (fwd->bk != bck))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("free(): corrupted unsorted chunks");
|
2004-11-13 05:43:36 +00:00
|
|
|
p->fd = fwd;
|
2007-04-30 22:18:46 +00:00
|
|
|
p->bk = bck;
|
|
|
|
if (!in_smallbin_range(size))
|
|
|
|
{
|
|
|
|
p->fd_nextsize = NULL;
|
|
|
|
p->bk_nextsize = NULL;
|
|
|
|
}
|
2004-11-13 05:43:36 +00:00
|
|
|
bck->fd = p;
|
|
|
|
fwd->bk = p;
|
1996-12-10 03:08:06 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
set_head(p, size | PREV_INUSE);
|
|
|
|
set_foot(p, size);
|
|
|
|
|
|
|
|
check_free_chunk(av, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
If the chunk borders the current high end of memory,
|
|
|
|
consolidate into top
|
|
|
|
*/
|
|
|
|
|
|
|
|
else {
|
|
|
|
size += nextsize;
|
|
|
|
set_head(p, size | PREV_INUSE);
|
|
|
|
av->top = p;
|
|
|
|
check_chunk(av, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
If freeing a large space, consolidate possibly-surrounding
|
|
|
|
chunks. Then, if the total unused topmost memory exceeds trim
|
|
|
|
threshold, ask malloc_trim to reduce top.
|
|
|
|
|
|
|
|
Unless max_fast is 0, we don't know if there are fastbins
|
|
|
|
bordering top, so we cannot tell for sure whether threshold
|
|
|
|
has been reached unless fastbins are consolidated. But we
|
|
|
|
don't want to consolidate on each free. As a compromise,
|
|
|
|
consolidation is performed if FASTBIN_CONSOLIDATION_THRESHOLD
|
|
|
|
is reached.
|
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
if ((unsigned long)(size) >= FASTBIN_CONSOLIDATION_THRESHOLD) {
|
2017-10-17 17:43:31 +00:00
|
|
|
if (atomic_load_relaxed (&av->have_fastchunks))
|
2004-11-13 05:43:36 +00:00
|
|
|
malloc_consolidate(av);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
if (av == &main_arena) {
|
2002-02-07 05:30:48 +00:00
|
|
|
#ifndef MORECORE_CANNOT_TRIM
|
2004-11-13 05:43:36 +00:00
|
|
|
if ((unsigned long)(chunksize(av->top)) >=
|
|
|
|
(unsigned long)(mp_.trim_threshold))
|
2012-01-31 23:49:22 +00:00
|
|
|
systrim(mp_.top_pad, av);
|
2002-01-29 07:54:51 +00:00
|
|
|
#endif
|
2004-11-13 05:43:36 +00:00
|
|
|
} else {
|
|
|
|
/* Always try heap_trim(), even if the top chunk is not
|
|
|
|
large, because the corresponding heap might go away. */
|
|
|
|
heap_info *heap = heap_for_ptr(top(av));
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2004-11-13 05:43:36 +00:00
|
|
|
assert(heap->ar_ptr == av);
|
|
|
|
heap_trim(heap, mp_.top_pad);
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
|
|
|
}
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2017-08-31 12:55:11 +00:00
|
|
|
if (!have_lock)
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_unlock (av->mutex);
|
2004-11-13 05:43:36 +00:00
|
|
|
}
|
|
|
|
/*
|
2011-09-10 22:10:17 +00:00
|
|
|
If the chunk was allocated via mmap, release via munmap().
|
2004-11-13 05:43:36 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
else {
|
2004-11-13 18:58:01 +00:00
|
|
|
munmap_chunk (p);
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
}
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
------------------------- malloc_consolidate -------------------------
|
|
|
|
|
|
|
|
malloc_consolidate is a specialized version of free() that tears
|
|
|
|
down chunks held in fastbins. Free itself cannot be used for this
|
|
|
|
purpose since, among other things, it might place chunks back onto
|
|
|
|
fastbins. So, instead, we need to use a minor variant of the same
|
|
|
|
code.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void malloc_consolidate(mstate av)
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
mfastbinptr* fb; /* current fastbin being consolidated */
|
|
|
|
mfastbinptr* maxfb; /* last fastbin (for loop control) */
|
|
|
|
mchunkptr p; /* current chunk being consolidated */
|
|
|
|
mchunkptr nextp; /* next chunk to consolidate */
|
|
|
|
mchunkptr unsorted_bin; /* bin header */
|
|
|
|
mchunkptr first_unsorted; /* chunk to link to */
|
|
|
|
|
|
|
|
/* These have same use as in free() */
|
|
|
|
mchunkptr nextchunk;
|
|
|
|
INTERNAL_SIZE_T size;
|
|
|
|
INTERNAL_SIZE_T nextsize;
|
|
|
|
INTERNAL_SIZE_T prevsize;
|
|
|
|
int nextinuse;
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
atomic_store_relaxed (&av->have_fastchunks, false);
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
unsorted_bin = unsorted_chunks(av);
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
/*
|
|
|
|
Remove each chunk from fast bin and consolidate it, placing it
|
|
|
|
then in unsorted bin. Among other reasons for doing this,
|
|
|
|
placing in unsorted bin avoids needing to calculate actual bins
|
|
|
|
until malloc is sure that chunks aren't immediately going to be
|
|
|
|
reused anyway.
|
|
|
|
*/
|
2009-08-31 11:55:10 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
maxfb = &fastbin (av, NFASTBINS - 1);
|
|
|
|
fb = &fastbin (av, 0);
|
|
|
|
do {
|
2019-01-18 21:38:32 +00:00
|
|
|
p = atomic_exchange_acq (fb, NULL);
|
2017-10-17 17:55:16 +00:00
|
|
|
if (p != 0) {
|
|
|
|
do {
|
2018-01-12 14:26:20 +00:00
|
|
|
{
|
2020-03-31 06:00:14 +00:00
|
|
|
if (__glibc_unlikely (misaligned_chunk (p)))
|
2020-03-31 05:55:13 +00:00
|
|
|
malloc_printerr ("malloc_consolidate(): "
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
"unaligned fastbin chunk detected");
|
|
|
|
|
2018-01-12 14:26:20 +00:00
|
|
|
unsigned int idx = fastbin_index (chunksize (p));
|
|
|
|
if ((&fastbin (av, idx)) != fb)
|
|
|
|
malloc_printerr ("malloc_consolidate(): invalid chunk size");
|
|
|
|
}
|
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
check_inuse_chunk(av, p);
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
nextp = REVEAL_PTR (p->fd);
|
2017-10-17 17:55:16 +00:00
|
|
|
|
|
|
|
/* Slightly streamlined version of consolidation code in free() */
|
|
|
|
size = chunksize (p);
|
|
|
|
nextchunk = chunk_at_offset(p, size);
|
|
|
|
nextsize = chunksize(nextchunk);
|
|
|
|
|
|
|
|
if (!prev_inuse(p)) {
|
|
|
|
prevsize = prev_size (p);
|
|
|
|
size += prevsize;
|
|
|
|
p = chunk_at_offset(p, -((long) prevsize));
|
2018-08-17 01:08:36 +00:00
|
|
|
if (__glibc_unlikely (chunksize(p) != prevsize))
|
|
|
|
malloc_printerr ("corrupted size vs. prev_size in fastbins");
|
2018-11-12 13:15:14 +00:00
|
|
|
unlink_chunk (av, p);
|
2017-10-17 17:55:16 +00:00
|
|
|
}
|
2009-08-31 11:55:10 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
if (nextchunk != av->top) {
|
|
|
|
nextinuse = inuse_bit_at_offset(nextchunk, nextsize);
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
if (!nextinuse) {
|
|
|
|
size += nextsize;
|
2018-11-12 13:15:14 +00:00
|
|
|
unlink_chunk (av, nextchunk);
|
2017-10-17 17:55:16 +00:00
|
|
|
} else
|
|
|
|
clear_inuse_bit_at_offset(nextchunk, 0);
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
first_unsorted = unsorted_bin->fd;
|
|
|
|
unsorted_bin->fd = p;
|
|
|
|
first_unsorted->bk = p;
|
2007-04-30 22:18:46 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
if (!in_smallbin_range (size)) {
|
|
|
|
p->fd_nextsize = NULL;
|
|
|
|
p->bk_nextsize = NULL;
|
2009-08-31 11:55:10 +00:00
|
|
|
}
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
set_head(p, size | PREV_INUSE);
|
|
|
|
p->bk = unsorted_bin;
|
|
|
|
p->fd = first_unsorted;
|
|
|
|
set_foot(p, size);
|
|
|
|
}
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
else {
|
|
|
|
size += nextsize;
|
|
|
|
set_head(p, size | PREV_INUSE);
|
|
|
|
av->top = p;
|
|
|
|
}
|
2002-02-07 05:30:48 +00:00
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
} while ( (p = nextp) != 0);
|
|
|
|
|
|
|
|
}
|
|
|
|
} while (fb++ != maxfb);
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
------------------------------ realloc ------------------------------
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2011-09-10 22:10:17 +00:00
|
|
|
void*
|
2009-04-08 18:00:34 +00:00
|
|
|
_int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize,
|
|
|
|
INTERNAL_SIZE_T nb)
|
2002-01-29 07:54:51 +00:00
|
|
|
{
|
|
|
|
mchunkptr newp; /* chunk to return */
|
|
|
|
INTERNAL_SIZE_T newsize; /* its size */
|
2011-09-10 22:10:17 +00:00
|
|
|
void* newmem; /* corresponding user mem */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
mchunkptr next; /* next contiguous chunk after oldp */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
mchunkptr remainder; /* extra space at end of newp */
|
|
|
|
unsigned long remainder_size; /* its size */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2009-02-07 22:49:34 +00:00
|
|
|
/* oldmem size */
|
2020-12-21 15:03:03 +00:00
|
|
|
if (__builtin_expect (chunksize_nomask (oldp) <= CHUNK_HDR_SZ, 0)
|
2004-12-11 21:15:24 +00:00
|
|
|
|| __builtin_expect (oldsize >= av->system_mem, 0))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("realloc(): invalid old size");
|
2004-12-11 21:15:24 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
check_inuse_chunk (av, oldp);
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2009-04-08 18:00:34 +00:00
|
|
|
/* All callers already filter out mmap'ed chunks. */
|
2014-01-02 08:38:18 +00:00
|
|
|
assert (!chunk_is_mmapped (oldp));
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
next = chunk_at_offset (oldp, oldsize);
|
|
|
|
INTERNAL_SIZE_T nextsize = chunksize (next);
|
2020-12-21 15:03:03 +00:00
|
|
|
if (__builtin_expect (chunksize_nomask (next) <= CHUNK_HDR_SZ, 0)
|
2011-09-10 22:10:17 +00:00
|
|
|
|| __builtin_expect (nextsize >= av->system_mem, 0))
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr ("realloc(): invalid next size");
|
2011-09-10 22:10:17 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if ((unsigned long) (oldsize) >= (unsigned long) (nb))
|
|
|
|
{
|
|
|
|
/* already big enough; split below */
|
2002-01-29 07:54:51 +00:00
|
|
|
newp = oldp;
|
2014-01-02 08:38:18 +00:00
|
|
|
newsize = oldsize;
|
1997-04-15 01:38:39 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Try to expand forward into top */
|
|
|
|
if (next == av->top &&
|
|
|
|
(unsigned long) (newsize = oldsize + nextsize) >=
|
|
|
|
(unsigned long) (nb + MINSIZE))
|
|
|
|
{
|
|
|
|
set_head_size (oldp, nb | (av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
av->top = chunk_at_offset (oldp, nb);
|
|
|
|
set_head (av->top, (newsize - nb) | PREV_INUSE);
|
|
|
|
check_inuse_chunk (av, oldp);
|
2021-03-11 14:49:45 +00:00
|
|
|
return tag_new_usable (chunk2mem (oldp));
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to expand forward into next chunk; split off remainder below */
|
|
|
|
else if (next != av->top &&
|
|
|
|
!inuse (next) &&
|
|
|
|
(unsigned long) (newsize = oldsize + nextsize) >=
|
|
|
|
(unsigned long) (nb))
|
|
|
|
{
|
|
|
|
newp = oldp;
|
2018-11-12 13:15:14 +00:00
|
|
|
unlink_chunk (av, next);
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* allocate, copy, free */
|
|
|
|
else
|
|
|
|
{
|
|
|
|
newmem = _int_malloc (av, nb - MALLOC_ALIGN_MASK);
|
|
|
|
if (newmem == 0)
|
|
|
|
return 0; /* propagate failure */
|
|
|
|
|
|
|
|
newp = mem2chunk (newmem);
|
|
|
|
newsize = chunksize (newp);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Avoid copy if newp is next chunk after oldp.
|
|
|
|
*/
|
|
|
|
if (newp == next)
|
|
|
|
{
|
|
|
|
newsize += oldsize;
|
|
|
|
newp = oldp;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2021-03-11 14:49:45 +00:00
|
|
|
void *oldmem = chunk2mem (oldp);
|
2021-03-08 12:59:05 +00:00
|
|
|
size_t sz = memsize (oldp);
|
2021-02-16 14:12:25 +00:00
|
|
|
(void) tag_region (oldmem, sz);
|
|
|
|
newmem = tag_new_usable (newmem);
|
2021-03-11 14:09:56 +00:00
|
|
|
memcpy (newmem, oldmem, sz);
|
|
|
|
_int_free (av, oldp, 1);
|
|
|
|
check_inuse_chunk (av, newp);
|
|
|
|
return newmem;
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2011-09-10 22:10:17 +00:00
|
|
|
/* If possible, free extra space in old or extended chunk */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
assert ((unsigned long) (newsize) >= (unsigned long) (nb));
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2011-09-10 22:10:17 +00:00
|
|
|
remainder_size = newsize - nb;
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (remainder_size < MINSIZE) /* not enough extra to split off */
|
|
|
|
{
|
|
|
|
set_head_size (newp, newsize | (av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
set_inuse_bit_at_offset (newp, newsize);
|
|
|
|
}
|
|
|
|
else /* split remainder */
|
|
|
|
{
|
|
|
|
remainder = chunk_at_offset (newp, nb);
|
2020-12-21 15:03:03 +00:00
|
|
|
/* Clear any user-space tags before writing the header. */
|
2021-02-16 14:12:25 +00:00
|
|
|
remainder = tag_region (remainder, remainder_size);
|
2014-01-02 08:38:18 +00:00
|
|
|
set_head_size (newp, nb | (av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
set_head (remainder, remainder_size | PREV_INUSE |
|
|
|
|
(av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
/* Mark remainder as inuse so free() won't complain */
|
|
|
|
set_inuse_bit_at_offset (remainder, remainder_size);
|
|
|
|
_int_free (av, remainder, 1);
|
|
|
|
}
|
2011-09-10 22:10:17 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
check_inuse_chunk (av, newp);
|
2021-03-11 14:49:45 +00:00
|
|
|
return tag_new_usable (chunk2mem (newp));
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
------------------------------ memalign ------------------------------
|
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static void *
|
|
|
|
_int_memalign (mstate av, size_t alignment, size_t bytes)
|
2002-01-29 07:54:51 +00:00
|
|
|
{
|
|
|
|
INTERNAL_SIZE_T nb; /* padded request size */
|
2014-01-02 08:38:18 +00:00
|
|
|
char *m; /* memory returned by malloc call */
|
|
|
|
mchunkptr p; /* corresponding chunk */
|
|
|
|
char *brk; /* alignment point within p */
|
|
|
|
mchunkptr newp; /* chunk to return */
|
2002-01-29 07:54:51 +00:00
|
|
|
INTERNAL_SIZE_T newsize; /* its size */
|
|
|
|
INTERNAL_SIZE_T leadsize; /* leading space before alignment point */
|
2014-01-02 08:38:18 +00:00
|
|
|
mchunkptr remainder; /* spare room at end to split off */
|
|
|
|
unsigned long remainder_size; /* its size */
|
2002-01-29 07:54:51 +00:00
|
|
|
INTERNAL_SIZE_T size;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
malloc: make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)
As discussed previously on libc-alpha [1], this patch follows up the idea
and add both the __attribute_alloc_size__ on malloc functions (malloc,
calloc, realloc, reallocarray, valloc, pvalloc, and memalign) and limit
maximum requested allocation size to up PTRDIFF_MAX (taking into
consideration internal padding and alignment).
This aligns glibc with gcc expected size defined by default warning
-Walloc-size-larger-than value which warns for allocation larger than
PTRDIFF_MAX. It also aligns with gcc expectation regarding libc and
expected size, such as described in PR#67999 [2] and previously discussed
ISO C11 issues [3] on libc-alpha.
From the RFC thread [4] and previous discussion, it seems that consensus
is only to limit such requested size for malloc functions, not the system
allocation one (mmap, sbrk, etc.).
The implementation changes checked_request2size to check for both overflow
and maximum object size up to PTRDIFF_MAX. No additional checks are done
on sysmalloc, so it can still issue mmap with values larger than
PTRDIFF_T depending on the requested size.
The __attribute_alloc_size__ is for functions that return a pointer only,
which means it cannot be applied to posix_memalign (see remarks in GCC
PR#87683 [5]). The runtimes checks to limit maximum requested allocation
size does applies to posix_memalign.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[1] https://sourceware.org/ml/libc-alpha/2018-11/msg00223.html
[2] https://gcc.gnu.org/bugzilla//show_bug.cgi?id=67999
[3] https://sourceware.org/ml/libc-alpha/2011-12/msg00066.html
[4] https://sourceware.org/ml/libc-alpha/2018-11/msg00224.html
[5] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87683
[BZ #23741]
* malloc/hooks.c (malloc_check, realloc_check): Use
__builtin_add_overflow on overflow check and adapt to
checked_request2size change.
* malloc/malloc.c (__libc_malloc, __libc_realloc, _mid_memalign,
__libc_pvalloc, __libc_calloc, _int_memalign): Limit maximum
allocation size to PTRDIFF_MAX.
(REQUEST_OUT_OF_RANGE): Remove macro.
(checked_request2size): Change to inline function and limit maximum
requested size to PTRDIFF_MAX.
(__libc_malloc, __libc_realloc, _int_malloc, _int_memalign): Limit
maximum allocation size to PTRDIFF_MAX.
(_mid_memalign): Use _int_memalign call for overflow check.
(__libc_pvalloc): Use __builtin_add_overflow on overflow check.
(__libc_calloc): Use __builtin_mul_overflow for overflow check and
limit maximum requested size to PTRDIFF_MAX.
* malloc/malloc.h (malloc, calloc, realloc, reallocarray, memalign,
valloc, pvalloc): Add __attribute_alloc_size__.
* stdlib/stdlib.h (malloc, realloc, reallocarray, valloc): Likewise.
* malloc/tst-malloc-too-large.c (do_test): Add check for allocation
larger than PTRDIFF_MAX.
* malloc/tst-memalign.c (do_test): Disable -Walloc-size-larger-than=
around tests of malloc with negative sizes.
* malloc/tst-posix_memalign.c (do_test): Likewise.
* malloc/tst-pvalloc.c (do_test): Likewise.
* malloc/tst-valloc.c (do_test): Likewise.
* malloc/tst-reallocarray.c (do_test): Replace call to reallocarray
with resulting size allocation larger than PTRDIFF_MAX with
reallocarray_nowarn.
(reallocarray_nowarn): New function.
* NEWS: Mention the malloc function semantic change.
2018-12-18 18:30:56 +00:00
|
|
|
if (!checked_request2size (bytes, &nb))
|
|
|
|
{
|
|
|
|
__set_errno (ENOMEM);
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
Strategy: find a spot within that chunk that meets the alignment
|
|
|
|
request, and then possibly free the leading and trailing space.
|
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/* Call malloc with worst case padding to hit alignment. */
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
m = (char *) (_int_malloc (av, nb + alignment + MINSIZE));
|
|
|
|
|
|
|
|
if (m == 0)
|
|
|
|
return 0; /* propagate failure */
|
|
|
|
|
|
|
|
p = mem2chunk (m);
|
|
|
|
|
|
|
|
if ((((unsigned long) (m)) % alignment) != 0) /* misaligned */
|
|
|
|
|
|
|
|
{ /*
|
|
|
|
Find an aligned spot inside chunk. Since we need to give back
|
|
|
|
leading space in a chunk of at least MINSIZE, if the first
|
|
|
|
calculation places us at a spot with less than MINSIZE leader,
|
|
|
|
we can move to the next aligned spot -- we've allocated enough
|
|
|
|
total room so that this is always possible.
|
|
|
|
*/
|
|
|
|
brk = (char *) mem2chunk (((unsigned long) (m + alignment - 1)) &
|
|
|
|
- ((signed long) alignment));
|
|
|
|
if ((unsigned long) (brk - (char *) (p)) < MINSIZE)
|
|
|
|
brk += alignment;
|
|
|
|
|
|
|
|
newp = (mchunkptr) brk;
|
|
|
|
leadsize = brk - (char *) (p);
|
|
|
|
newsize = chunksize (p) - leadsize;
|
|
|
|
|
|
|
|
/* For mmapped chunks, just adjust offset */
|
|
|
|
if (chunk_is_mmapped (p))
|
|
|
|
{
|
2016-10-28 14:26:57 +00:00
|
|
|
set_prev_size (newp, prev_size (p) + leadsize);
|
2014-01-02 08:38:18 +00:00
|
|
|
set_head (newp, newsize | IS_MMAPPED);
|
2021-03-11 14:49:45 +00:00
|
|
|
return chunk2mem (newp);
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Otherwise, give back leader, use the rest */
|
|
|
|
set_head (newp, newsize | PREV_INUSE |
|
|
|
|
(av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
set_inuse_bit_at_offset (newp, newsize);
|
|
|
|
set_head_size (p, leadsize | (av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
_int_free (av, p, 1);
|
|
|
|
p = newp;
|
|
|
|
|
|
|
|
assert (newsize >= nb &&
|
2021-03-11 14:49:45 +00:00
|
|
|
(((unsigned long) (chunk2mem (p))) % alignment) == 0);
|
1996-12-08 08:01:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Also give back spare room at the end */
|
2014-01-02 08:38:18 +00:00
|
|
|
if (!chunk_is_mmapped (p))
|
|
|
|
{
|
|
|
|
size = chunksize (p);
|
|
|
|
if ((unsigned long) (size) > (unsigned long) (nb + MINSIZE))
|
|
|
|
{
|
|
|
|
remainder_size = size - nb;
|
|
|
|
remainder = chunk_at_offset (p, nb);
|
|
|
|
set_head (remainder, remainder_size | PREV_INUSE |
|
|
|
|
(av != &main_arena ? NON_MAIN_ARENA : 0));
|
|
|
|
set_head_size (p, nb);
|
|
|
|
_int_free (av, remainder, 1);
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
check_inuse_chunk (av, p);
|
2021-03-11 14:49:45 +00:00
|
|
|
return chunk2mem (p);
|
1996-12-08 08:01:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
------------------------------ malloc_trim ------------------------------
|
|
|
|
*/
|
1996-12-10 03:08:06 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
static int
|
|
|
|
mtrim (mstate av, size_t pad)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2017-10-17 17:55:16 +00:00
|
|
|
/* Ensure all blocks are consolidated. */
|
2007-12-16 22:53:08 +00:00
|
|
|
malloc_consolidate (av);
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
const size_t ps = GLRO (dl_pagesize);
|
2007-12-16 22:53:08 +00:00
|
|
|
int psindex = bin_index (ps);
|
|
|
|
const size_t psm1 = ps - 1;
|
|
|
|
|
|
|
|
int result = 0;
|
|
|
|
for (int i = 1; i < NBINS; ++i)
|
|
|
|
if (i == 1 || i >= psindex)
|
|
|
|
{
|
2014-01-02 08:38:18 +00:00
|
|
|
mbinptr bin = bin_at (av, i);
|
2007-12-16 22:53:08 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
for (mchunkptr p = last (bin); p != bin; p = p->bk)
|
|
|
|
{
|
|
|
|
INTERNAL_SIZE_T size = chunksize (p);
|
2007-12-16 22:53:08 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (size > psm1 + sizeof (struct malloc_chunk))
|
|
|
|
{
|
|
|
|
/* See whether the chunk contains at least one unused page. */
|
|
|
|
char *paligned_mem = (char *) (((uintptr_t) p
|
|
|
|
+ sizeof (struct malloc_chunk)
|
|
|
|
+ psm1) & ~psm1);
|
2007-12-16 22:53:08 +00:00
|
|
|
|
2021-03-11 14:49:45 +00:00
|
|
|
assert ((char *) chunk2mem (p) + 2 * CHUNK_HDR_SZ
|
2020-12-21 15:03:03 +00:00
|
|
|
<= paligned_mem);
|
2014-01-02 08:38:18 +00:00
|
|
|
assert ((char *) p + size > paligned_mem);
|
2007-12-16 22:53:08 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
/* This is the size we could potentially free. */
|
|
|
|
size -= paligned_mem - (char *) p;
|
2007-12-16 22:53:08 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (size > psm1)
|
|
|
|
{
|
2014-03-31 14:00:32 +00:00
|
|
|
#if MALLOC_DEBUG
|
2014-01-02 08:38:18 +00:00
|
|
|
/* When debugging we simulate destroying the memory
|
|
|
|
content. */
|
|
|
|
memset (paligned_mem, 0x89, size & ~psm1);
|
2007-12-16 22:53:08 +00:00
|
|
|
#endif
|
2014-01-02 08:38:18 +00:00
|
|
|
__madvise (paligned_mem, size & ~psm1, MADV_DONTNEED);
|
2007-12-16 22:53:08 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-12-16 22:53:08 +00:00
|
|
|
}
|
1996-12-10 03:08:06 +00:00
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
#ifndef MORECORE_CANNOT_TRIM
|
2012-01-31 23:49:22 +00:00
|
|
|
return result | (av == &main_arena ? systrim (pad, av) : 0);
|
2014-01-02 08:38:18 +00:00
|
|
|
|
1996-12-10 03:08:06 +00:00
|
|
|
#else
|
2007-12-16 22:53:08 +00:00
|
|
|
return result;
|
1996-12-08 08:01:13 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-01-31 23:49:22 +00:00
|
|
|
int
|
2014-01-02 08:38:18 +00:00
|
|
|
__malloc_trim (size_t s)
|
2012-01-31 23:49:22 +00:00
|
|
|
{
|
|
|
|
int result = 0;
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (__malloc_initialized < 0)
|
2012-01-31 23:49:22 +00:00
|
|
|
ptmalloc_init ();
|
|
|
|
|
|
|
|
mstate ar_ptr = &main_arena;
|
|
|
|
do
|
|
|
|
{
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_lock (ar_ptr->mutex);
|
2012-01-31 23:49:22 +00:00
|
|
|
result |= mtrim (ar_ptr, s);
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_unlock (ar_ptr->mutex);
|
2012-01-31 23:49:22 +00:00
|
|
|
|
|
|
|
ar_ptr = ar_ptr->next;
|
|
|
|
}
|
|
|
|
while (ar_ptr != &main_arena);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1996-12-08 08:01:13 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
------------------------- malloc_usable_size -------------------------
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2012-01-31 23:49:22 +00:00
|
|
|
static size_t
|
2014-01-02 08:38:18 +00:00
|
|
|
musable (void *mem)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
|
|
|
mchunkptr p;
|
2014-01-02 08:38:18 +00:00
|
|
|
if (mem != 0)
|
|
|
|
{
|
2020-12-21 15:03:03 +00:00
|
|
|
size_t result = 0;
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
p = mem2chunk (mem);
|
|
|
|
|
|
|
|
if (__builtin_expect (using_malloc_checking == 1, 0))
|
2020-12-21 15:03:03 +00:00
|
|
|
return malloc_check_get_size (p);
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
if (chunk_is_mmapped (p))
|
2016-06-11 10:09:19 +00:00
|
|
|
{
|
|
|
|
if (DUMPED_MAIN_ARENA_CHUNK (p))
|
2020-12-21 15:03:03 +00:00
|
|
|
result = chunksize (p) - SIZE_SZ;
|
2016-06-11 10:09:19 +00:00
|
|
|
else
|
2020-12-21 15:03:03 +00:00
|
|
|
result = chunksize (p) - CHUNK_HDR_SZ;
|
2016-06-11 10:09:19 +00:00
|
|
|
}
|
2014-01-02 08:38:18 +00:00
|
|
|
else if (inuse (p))
|
2021-03-08 12:59:05 +00:00
|
|
|
result = memsize (p);
|
2020-12-21 15:03:03 +00:00
|
|
|
|
|
|
|
return result;
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
return 0;
|
1996-12-08 08:01:13 +00:00
|
|
|
}
|
|
|
|
|
2012-01-31 23:49:22 +00:00
|
|
|
|
|
|
|
size_t
|
2014-01-02 08:38:18 +00:00
|
|
|
__malloc_usable_size (void *m)
|
2012-01-31 23:49:22 +00:00
|
|
|
{
|
|
|
|
size_t result;
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
result = musable (m);
|
2012-01-31 23:49:22 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
------------------------------ mallinfo ------------------------------
|
|
|
|
Accumulate malloc statistics for arena AV into M.
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2012-05-16 23:46:10 +00:00
|
|
|
static void
|
2020-07-07 11:58:24 +00:00
|
|
|
int_mallinfo (mstate av, struct mallinfo2 *m)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2002-08-25 04:51:08 +00:00
|
|
|
size_t i;
|
1996-12-08 08:01:13 +00:00
|
|
|
mbinptr b;
|
|
|
|
mchunkptr p;
|
|
|
|
INTERNAL_SIZE_T avail;
|
2002-01-29 07:54:51 +00:00
|
|
|
INTERNAL_SIZE_T fastavail;
|
|
|
|
int nblocks;
|
|
|
|
int nfastblocks;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
check_malloc_state (av);
|
1996-12-10 03:08:06 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Account for top */
|
2014-01-02 08:38:18 +00:00
|
|
|
avail = chunksize (av->top);
|
2002-01-29 07:54:51 +00:00
|
|
|
nblocks = 1; /* top always exists */
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* traverse fastbins */
|
|
|
|
nfastblocks = 0;
|
|
|
|
fastavail = 0;
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
for (i = 0; i < NFASTBINS; ++i)
|
|
|
|
{
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
for (p = fastbin (av, i);
|
|
|
|
p != 0;
|
|
|
|
p = REVEAL_PTR (p->fd))
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
2020-03-31 06:00:14 +00:00
|
|
|
if (__glibc_unlikely (misaligned_chunk (p)))
|
2020-03-31 05:55:13 +00:00
|
|
|
malloc_printerr ("int_mallinfo(): "
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
"unaligned fastbin chunk detected");
|
2014-01-02 08:38:18 +00:00
|
|
|
++nfastblocks;
|
|
|
|
fastavail += chunksize (p);
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
avail += fastavail;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* traverse regular bins */
|
2014-01-02 08:38:18 +00:00
|
|
|
for (i = 1; i < NBINS; ++i)
|
|
|
|
{
|
|
|
|
b = bin_at (av, i);
|
|
|
|
for (p = last (b); p != b; p = p->bk)
|
|
|
|
{
|
|
|
|
++nblocks;
|
|
|
|
avail += chunksize (p);
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2012-05-16 23:46:10 +00:00
|
|
|
m->smblks += nfastblocks;
|
|
|
|
m->ordblks += nblocks;
|
|
|
|
m->fordblks += avail;
|
|
|
|
m->uordblks += av->system_mem - avail;
|
|
|
|
m->arena += av->system_mem;
|
|
|
|
m->fsmblks += fastavail;
|
|
|
|
if (av == &main_arena)
|
|
|
|
{
|
|
|
|
m->hblks = mp_.n_mmaps;
|
|
|
|
m->hblkhd = mp_.mmapped_mem;
|
2016-02-19 16:07:04 +00:00
|
|
|
m->usmblks = 0;
|
2014-01-02 08:38:18 +00:00
|
|
|
m->keepcost = chunksize (av->top);
|
2012-05-16 23:46:10 +00:00
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2012-01-31 23:49:22 +00:00
|
|
|
|
2020-07-07 11:58:24 +00:00
|
|
|
struct mallinfo2
|
|
|
|
__libc_mallinfo2 (void)
|
2012-01-31 23:49:22 +00:00
|
|
|
{
|
2020-07-07 11:58:24 +00:00
|
|
|
struct mallinfo2 m;
|
2012-05-16 23:46:10 +00:00
|
|
|
mstate ar_ptr;
|
2012-01-31 23:49:22 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (__malloc_initialized < 0)
|
2012-01-31 23:49:22 +00:00
|
|
|
ptmalloc_init ();
|
2012-05-16 23:46:10 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
memset (&m, 0, sizeof (m));
|
2012-05-16 23:46:10 +00:00
|
|
|
ar_ptr = &main_arena;
|
2014-01-02 08:38:18 +00:00
|
|
|
do
|
|
|
|
{
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_lock (ar_ptr->mutex);
|
2014-01-02 08:38:18 +00:00
|
|
|
int_mallinfo (ar_ptr, &m);
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_unlock (ar_ptr->mutex);
|
2012-05-16 23:46:10 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
ar_ptr = ar_ptr->next;
|
|
|
|
}
|
|
|
|
while (ar_ptr != &main_arena);
|
2012-05-16 23:46:10 +00:00
|
|
|
|
2012-01-31 23:49:22 +00:00
|
|
|
return m;
|
|
|
|
}
|
2020-09-01 20:17:25 +00:00
|
|
|
libc_hidden_def (__libc_mallinfo2)
|
2012-01-31 23:49:22 +00:00
|
|
|
|
2020-07-07 11:58:24 +00:00
|
|
|
struct mallinfo
|
|
|
|
__libc_mallinfo (void)
|
|
|
|
{
|
|
|
|
struct mallinfo m;
|
|
|
|
struct mallinfo2 m2 = __libc_mallinfo2 ();
|
|
|
|
|
|
|
|
m.arena = m2.arena;
|
|
|
|
m.ordblks = m2.ordblks;
|
|
|
|
m.smblks = m2.smblks;
|
|
|
|
m.hblks = m2.hblks;
|
|
|
|
m.hblkhd = m2.hblkhd;
|
|
|
|
m.usmblks = m2.usmblks;
|
|
|
|
m.fsmblks = m2.fsmblks;
|
|
|
|
m.uordblks = m2.uordblks;
|
|
|
|
m.fordblks = m2.fordblks;
|
|
|
|
m.keepcost = m2.keepcost;
|
|
|
|
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
------------------------------ malloc_stats ------------------------------
|
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2012-01-31 23:49:22 +00:00
|
|
|
void
|
2013-06-08 00:22:23 +00:00
|
|
|
__malloc_stats (void)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
1996-12-10 03:08:06 +00:00
|
|
|
int i;
|
2002-01-29 07:54:51 +00:00
|
|
|
mstate ar_ptr;
|
|
|
|
unsigned int in_use_b = mp_.mmapped_mem, system_b = in_use_b;
|
1996-12-10 03:08:06 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (__malloc_initialized < 0)
|
2003-05-01 07:38:32 +00:00
|
|
|
ptmalloc_init ();
|
Update.
2003-09-12 Ulrich Drepper <drepper@redhat.com>
* grp/Makefile (CFLAGS-getgrgid_r.c, CFLAGS-getgrnam_r.c,
CFLAGS-fgetgrent.c, CFLAGS-fgetgrent_r.c, CFLAGS-putgrent.c,
CFLAGS-initgroups.c, CFLAGS-getgrgid.c): Add -fexceptions.
* inet/Makefile (CFLAGS-either_ntoh.c, CFLAGS-either_hton.c,
CFLAGS-getnetgrent.c, CFLAGS-getnetgrent_r.c): Likewise.
* io/Makefile (CFLAGS-posix_fallocate.c, CFLAGS-posix_fallocate64.c):
Likewise.
* misc/Makefile (CFLAGS-err.c): Likewise.
* posix/Makefile (CFLAGS-getaddrinfo.c, CFLAGS-spawn.c,
CFLAGS-spawnp.c, CFLAGS-spawni.c, CFLAGS-pause.c, CFLAGS-glob.c,
CFLAGS-glob64.c): Likewise.
* pwd/Makefile (CFLAGS-getpw.c): Likewise.
* shadow/Makefile (CFLAGS-fgetspent.c, CFLAGS-fgetspent_r.c,
CFLAGS-putspent.c, CFLAGS-getspnam.c, CFLAGS-getspnam_r.c): Likewise.
* stdio-common/Makefile (CFLAGS-cuserid.c): Likewise.
* sunrpc/Makefile (CFLAGS-openchild.c): Likewise.
* stdlib/Makefile (CFLAGS-mkstemp.c): Remove definition.
* libio/stdio.h: Remove __THROW from cuserid prototype.
* locale/loadarchive.c: Use only non-cancelable interfaces.
* resolv/herror.c (herror): Likewise.
* malloc/hooks.c: Before using IO stream mark stream so it uses
only non-cancelable interfaces.
* malloc/malloc.c: Likewise.
* posix/getopt.c: Likewise.
2003-09-11 Jakub Jelinek <jakub@redhat.com>
* Makerules (LDFLAGS-c.so): Remove -u __register_frame.
2003-09-12 Ulrich Drepper <drepper@redhat.com>
* stdio-common/stdio_ext.h: Mark most functions with __THROW.
* misc/err.h: Remove __THROW from all prototypes.
* posix/getopt.h (__THROW): Define if not already defined. Add
__THROW to the getopt functions.
2003-09-11 Ulrich Drepper <drepper@redhat.com>
* io/Makefile (CFLAGS-lockf.c): Add -fexceptions.
(CFLAGS-fts.c): Likewise.
* io/fcntl.h: Remove __THROW from lockf prototypes.
* io/fts.h: Remove most __THROW.
2003-09-12 22:37:19 +00:00
|
|
|
_IO_flockfile (stderr);
|
2018-02-07 23:42:04 +00:00
|
|
|
int old_flags2 = stderr->_flags2;
|
|
|
|
stderr->_flags2 |= _IO_FLAGS2_NOTCANCEL;
|
2014-01-02 08:38:18 +00:00
|
|
|
for (i = 0, ar_ptr = &main_arena;; i++)
|
|
|
|
{
|
2020-07-07 11:58:24 +00:00
|
|
|
struct mallinfo2 mi;
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
memset (&mi, 0, sizeof (mi));
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_lock (ar_ptr->mutex);
|
2014-01-02 08:38:18 +00:00
|
|
|
int_mallinfo (ar_ptr, &mi);
|
|
|
|
fprintf (stderr, "Arena %d:\n", i);
|
|
|
|
fprintf (stderr, "system bytes = %10u\n", (unsigned int) mi.arena);
|
|
|
|
fprintf (stderr, "in use bytes = %10u\n", (unsigned int) mi.uordblks);
|
2002-01-29 07:54:51 +00:00
|
|
|
#if MALLOC_DEBUG > 1
|
2014-01-02 08:38:18 +00:00
|
|
|
if (i > 0)
|
|
|
|
dump_heap (heap_for_ptr (top (ar_ptr)));
|
2002-01-29 07:54:51 +00:00
|
|
|
#endif
|
2014-01-02 08:38:18 +00:00
|
|
|
system_b += mi.arena;
|
|
|
|
in_use_b += mi.uordblks;
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_unlock (ar_ptr->mutex);
|
2014-01-02 08:38:18 +00:00
|
|
|
ar_ptr = ar_ptr->next;
|
|
|
|
if (ar_ptr == &main_arena)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
fprintf (stderr, "Total (incl. mmap):\n");
|
|
|
|
fprintf (stderr, "system bytes = %10u\n", system_b);
|
|
|
|
fprintf (stderr, "in use bytes = %10u\n", in_use_b);
|
|
|
|
fprintf (stderr, "max mmap regions = %10u\n", (unsigned int) mp_.max_n_mmaps);
|
|
|
|
fprintf (stderr, "max mmap bytes = %10lu\n",
|
|
|
|
(unsigned long) mp_.max_mmapped_mem);
|
2018-02-07 23:42:04 +00:00
|
|
|
stderr->_flags2 = old_flags2;
|
Update.
2003-09-12 Ulrich Drepper <drepper@redhat.com>
* grp/Makefile (CFLAGS-getgrgid_r.c, CFLAGS-getgrnam_r.c,
CFLAGS-fgetgrent.c, CFLAGS-fgetgrent_r.c, CFLAGS-putgrent.c,
CFLAGS-initgroups.c, CFLAGS-getgrgid.c): Add -fexceptions.
* inet/Makefile (CFLAGS-either_ntoh.c, CFLAGS-either_hton.c,
CFLAGS-getnetgrent.c, CFLAGS-getnetgrent_r.c): Likewise.
* io/Makefile (CFLAGS-posix_fallocate.c, CFLAGS-posix_fallocate64.c):
Likewise.
* misc/Makefile (CFLAGS-err.c): Likewise.
* posix/Makefile (CFLAGS-getaddrinfo.c, CFLAGS-spawn.c,
CFLAGS-spawnp.c, CFLAGS-spawni.c, CFLAGS-pause.c, CFLAGS-glob.c,
CFLAGS-glob64.c): Likewise.
* pwd/Makefile (CFLAGS-getpw.c): Likewise.
* shadow/Makefile (CFLAGS-fgetspent.c, CFLAGS-fgetspent_r.c,
CFLAGS-putspent.c, CFLAGS-getspnam.c, CFLAGS-getspnam_r.c): Likewise.
* stdio-common/Makefile (CFLAGS-cuserid.c): Likewise.
* sunrpc/Makefile (CFLAGS-openchild.c): Likewise.
* stdlib/Makefile (CFLAGS-mkstemp.c): Remove definition.
* libio/stdio.h: Remove __THROW from cuserid prototype.
* locale/loadarchive.c: Use only non-cancelable interfaces.
* resolv/herror.c (herror): Likewise.
* malloc/hooks.c: Before using IO stream mark stream so it uses
only non-cancelable interfaces.
* malloc/malloc.c: Likewise.
* posix/getopt.c: Likewise.
2003-09-11 Jakub Jelinek <jakub@redhat.com>
* Makerules (LDFLAGS-c.so): Remove -u __register_frame.
2003-09-12 Ulrich Drepper <drepper@redhat.com>
* stdio-common/stdio_ext.h: Mark most functions with __THROW.
* misc/err.h: Remove __THROW from all prototypes.
* posix/getopt.h (__THROW): Define if not already defined. Add
__THROW to the getopt functions.
2003-09-11 Ulrich Drepper <drepper@redhat.com>
* io/Makefile (CFLAGS-lockf.c): Add -fexceptions.
(CFLAGS-fts.c): Likewise.
* io/fcntl.h: Remove __THROW from lockf prototypes.
* io/fts.h: Remove most __THROW.
2003-09-12 22:37:19 +00:00
|
|
|
_IO_funlockfile (stderr);
|
1996-12-08 08:01:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
------------------------------ mallopt ------------------------------
|
|
|
|
*/
|
2019-02-06 17:16:43 +00:00
|
|
|
static __always_inline int
|
2016-10-27 03:04:55 +00:00
|
|
|
do_set_trim_threshold (size_t value)
|
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_mallopt_trim_threshold, 3, value, mp_.trim_threshold,
|
|
|
|
mp_.no_dyn_threshold);
|
|
|
|
mp_.trim_threshold = value;
|
|
|
|
mp_.no_dyn_threshold = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2019-02-06 17:16:43 +00:00
|
|
|
static __always_inline int
|
2016-10-27 03:04:55 +00:00
|
|
|
do_set_top_pad (size_t value)
|
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_mallopt_top_pad, 3, value, mp_.top_pad,
|
|
|
|
mp_.no_dyn_threshold);
|
|
|
|
mp_.top_pad = value;
|
|
|
|
mp_.no_dyn_threshold = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2019-02-06 17:16:43 +00:00
|
|
|
static __always_inline int
|
2016-10-27 03:04:55 +00:00
|
|
|
do_set_mmap_threshold (size_t value)
|
|
|
|
{
|
|
|
|
/* Forbid setting the threshold too high. */
|
|
|
|
if (value <= HEAP_MAX_SIZE / 2)
|
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_mallopt_mmap_threshold, 3, value, mp_.mmap_threshold,
|
|
|
|
mp_.no_dyn_threshold);
|
|
|
|
mp_.mmap_threshold = value;
|
|
|
|
mp_.no_dyn_threshold = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-02-06 17:16:43 +00:00
|
|
|
static __always_inline int
|
2016-10-27 03:04:55 +00:00
|
|
|
do_set_mmaps_max (int32_t value)
|
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_mallopt_mmap_max, 3, value, mp_.n_mmaps_max,
|
|
|
|
mp_.no_dyn_threshold);
|
|
|
|
mp_.n_mmaps_max = value;
|
|
|
|
mp_.no_dyn_threshold = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2019-02-06 17:16:43 +00:00
|
|
|
static __always_inline int
|
2016-10-27 03:04:55 +00:00
|
|
|
do_set_mallopt_check (int32_t value)
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2019-02-06 17:16:43 +00:00
|
|
|
static __always_inline int
|
2016-10-27 03:04:55 +00:00
|
|
|
do_set_perturb_byte (int32_t value)
|
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_mallopt_perturb, 2, value, perturb_byte);
|
|
|
|
perturb_byte = value;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2019-02-06 17:16:43 +00:00
|
|
|
static __always_inline int
|
2016-10-27 03:04:55 +00:00
|
|
|
do_set_arena_test (size_t value)
|
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_mallopt_arena_test, 2, value, mp_.arena_test);
|
|
|
|
mp_.arena_test = value;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2019-02-06 17:16:43 +00:00
|
|
|
static __always_inline int
|
2016-10-27 03:04:55 +00:00
|
|
|
do_set_arena_max (size_t value)
|
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_mallopt_arena_max, 2, value, mp_.arena_max);
|
|
|
|
mp_.arena_max = value;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-07-06 17:37:30 +00:00
|
|
|
#if USE_TCACHE
|
2019-02-06 17:16:43 +00:00
|
|
|
static __always_inline int
|
2017-07-06 17:37:30 +00:00
|
|
|
do_set_tcache_max (size_t value)
|
|
|
|
{
|
2019-12-03 22:44:36 +00:00
|
|
|
if (value <= MAX_TCACHE_SIZE)
|
2017-07-06 17:37:30 +00:00
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_tunable_tcache_max_bytes, 2, value, mp_.tcache_max_bytes);
|
|
|
|
mp_.tcache_max_bytes = value;
|
|
|
|
mp_.tcache_bins = csize2tidx (request2size(value)) + 1;
|
2019-12-03 22:44:36 +00:00
|
|
|
return 1;
|
2017-07-06 17:37:30 +00:00
|
|
|
}
|
2019-12-03 22:44:36 +00:00
|
|
|
return 0;
|
2017-07-06 17:37:30 +00:00
|
|
|
}
|
|
|
|
|
2019-02-06 17:16:43 +00:00
|
|
|
static __always_inline int
|
2017-07-06 17:37:30 +00:00
|
|
|
do_set_tcache_count (size_t value)
|
|
|
|
{
|
2019-05-10 15:38:21 +00:00
|
|
|
if (value <= MAX_TCACHE_COUNT)
|
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_tunable_tcache_count, 2, value, mp_.tcache_count);
|
|
|
|
mp_.tcache_count = value;
|
2019-12-03 22:44:36 +00:00
|
|
|
return 1;
|
2019-05-10 15:38:21 +00:00
|
|
|
}
|
2019-12-03 22:44:36 +00:00
|
|
|
return 0;
|
2017-07-06 17:37:30 +00:00
|
|
|
}
|
|
|
|
|
2019-02-06 17:16:43 +00:00
|
|
|
static __always_inline int
|
2017-07-06 17:37:30 +00:00
|
|
|
do_set_tcache_unsorted_limit (size_t value)
|
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_tunable_tcache_unsorted_limit, 2, value, mp_.tcache_unsorted_limit);
|
|
|
|
mp_.tcache_unsorted_limit = value;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2019-08-08 23:09:43 +00:00
|
|
|
static inline int
|
|
|
|
__always_inline
|
|
|
|
do_set_mxfast (size_t value)
|
|
|
|
{
|
2019-12-03 22:44:36 +00:00
|
|
|
if (value <= MAX_FAST_SIZE)
|
2019-08-08 23:09:43 +00:00
|
|
|
{
|
|
|
|
LIBC_PROBE (memory_mallopt_mxfast, 2, value, get_max_fast ());
|
|
|
|
set_max_fast (value);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
int
|
|
|
|
__libc_mallopt (int param_number, int value)
|
1996-12-08 08:01:13 +00:00
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
mstate av = &main_arena;
|
|
|
|
int res = 1;
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (__malloc_initialized < 0)
|
2003-09-08 16:33:12 +00:00
|
|
|
ptmalloc_init ();
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_lock (av->mutex);
|
update from main archive 970225
1997-02-24 23:05 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/malloc.c (malloc_get_state): New function.
Saves global malloc state to an opaque data structure which
is dynamically allocated in the heap.
* malloc/malloc.c (malloc_set_state): New function.
Restore previously obtained state.
* malloc/malloc.h: Add declaration of malloc_get_state()
and malloc_set_state().
1997-02-24 23:27 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-ieee754/s_cbrtl.c: Shift B1_EXP value to right
position.
1997-02-24 17:38 Ulrich Drepper <drepper@cygnus.com>
* misc/error.c: Make error and error_at_line weak aliases of
__error and __error_at_line respectively.
Suggested by David Mosberger-Tang <davidm@AZStarNet.COM>.
* sysdeps/unix/sysv/linux/i386/socket.S: Update copyright.
1997-02-22 11:30 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/ldd.bash.in: Run the program directly, not as argument
to the dynamic linker, if it contains an interpreter segment.
* elf/ldd.sh.in: Likewise.
* elf/rtld.c (dl_main): In verify mode check whether the dynamic
object contains an interpreter segment and exit with 2 if not.
1997-02-23 01:23 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makefile (distribute): Remove nsswitch.h, netgroup.h, mcheck.h
and xlocale.h. Make-dist adds them automagically.
1997-02-22 12:25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* locale/C-time.c (_nl_C_LC_TIME): Add missing entry for
time-era-num-entries.
1997-02-06 13:49 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* rellns-sh: No need to check for existance of first parameter.
1997-02-24 15:20 Jonathan T. Agnew <jtagnew@amherst.edu>
* glibcbug.in: Don't mention destination on MAIL_AGENT command line
to avoid duplicate mail.
1997-02-24 03:51 Ulrich Drepper <drepper@cygnus.com>
* Makefile (distribute): Add isomac.c.
(tests): Run isomac test.
* features.h (__USE_ISOC9X): New macro.
* catgets/catgets.c: Don't use global variable `optind'. Instead
use result computed by argp_parse.
* db/makedb: Likewise.
* locale/programs/locale.c: Likewise.
* locale/programs/localedef.c: Likewise.
* libio/stdio.h: Rewrite. Make it more readable and add comments.
* libio/clearerr.c: Remove clearerr_locked alias.
* libio/feof.c: Remove feof_locked alias.
* libio/ferror.c: Remove feof_locked alias.
* libio/fileno.c: Remove fileno_locked alias.
* libio/fputc.c: Remove fputc_locked alias.
* libio/getc.c: Remove getc_locked alias.
* libio/getchar.c: Remove getchar_locked alias.
* libio/iofflush.c: Remove fflush_locked alias.
* libio/putc.c: Remove putc_locked alias.
* libio/putc.c: Remove putchar_locked alias.
* stdio-common/printf_fp.c: When number is inifinity print INF
or inf depending on case of specifier. Same for NaN where NAN
or nan is printed. Specified in ISO C 9X.
* misc/sys/cdefs.h (__restrict): Define to empty string for now.
* stdio/stdio.h: Add __restrict to prototypes where necessary.
* libio/stdio.h: Likewise.
* stdlib/stdlib.h: Likewise.
* string/string.h: Likewise.
* time/time.h: Likewise.
* wcsmbs/wchar.h: Likewise.
* stdlib/strtod.c: Change to recognize INF, INFINITY, NAN, and
NAN(...).
* sysdeps/ieee754/huge_val.h: Define HUGE_VALF and HUGE_VALL instead
of HUGE_VALf and HUGE_VALL.
* stdlib/strtof.c (FLOAT_HUGE_VAL): Use standard name HUGE_VALF
instead of HUGE_VALf.
* wcsmbs/wcstof.c: Likewise.
* stdlib/strtold.c (FLOAT_HUGE_VAL): Use standard name HUGE_VALL
instead of HUGE_VALl.
* wcsmbs/wcstold.c: Likewise.
* sysdeps/posix/gai_strerror.c: Use size_t for counter variable to
avoid warning.
* wcsmbs/Makefile (routines): Add wcscasecmp and wcsncase.
* wcsmbs/wchar.h: Add prototypes for wcscasecmp and wcsncase.
* wcsmbs/wcscasecmp.c: New file.
* wcsmbs/wcsncase.c: New file.
* stdlib/strtol.c: Define wide character quad word functions as
wcstoll and wcstoull and normal versions as strtoll and strtoull.
* wcsmbs/wchar.h: Add prototypes for wcstoll and wcstoull.
* wcsmbs/wcstoq: Renamed to wcstoll.c.
* wcsmbs/wcstouq: Renamed to wcstoull.c.
* wcsmbs/wcstoll.c: Renamed from wcstoq.c. Make wcstoq a weak
alias of wcstoll.
* wcsmbs/wcstoull.c: Renamed from wcstouq.c. Make wcstouq a weak
alias of wcstoull.
* wcsmbs/Makefile (routines): Replace wcstoq and wcstouq by
wcstoll and wcstoull respectively.
* stdlib/strtoq.c: Rename to strtoll.c.
* stdlib/strtouq.c: Rename to strtoull.c.
* stdlib/strtoll.c: Renamed from strtoq.c. Make strtoq a weak
alias of strtoll.
* stdlib/strtoll.c: Renamed from strtouq.c. Make strtouq a weak
alias of strtoull.
* stdlib/Makefile (routines): Replace strtoq and strtouq by
strtoll and strtoull respectively.
* stdio-common/vfscanf.c: Don't use __strtoq_internal and
__strtouq_internal but instead __strtoll_internal and
__strtoull_internal respectively.
* stdlib/stdlib.h (strtoq): Use __internal_strtoll in inline version.
(strtouq): Similar with __internal_strtoull.
* wcsmbs/wchar.h (wcstoq): Use __internal_wcstoll in inline version.
(wcstouq): Similar with __internal_wcstoull.
1997-02-23 04:38 Ulrich Drepper <drepper@cygnus.com>
* stdlib/strtol.c (STRTOL): It is not illegal to parse a minus
sign in the strtouXX functions. The results gets simply negated.
* stdio-common/tstscanf.c: Add testcase for above case.
* stdlib/tst-strtol.c: Correct tests.
* manual/stdio-fp.c: New file. Generate output for example program
in stdio.texi.
* stdio-common/Makefile (routines): Add printf_fphex.
* stdio-common/vfprintf.c: Add handling of %a and %A specifier.
* stdio-common/printf_fphex.c: New file. Implement %a and %A
specifier.
1997-02-22 03:01 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/timebits.h (CLK_TCK): Don't defined if
__STRICT_ANSI__.
* math/math.h: Prevent definition of struct exception when using
C++.
1997-02-22 01:45 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/syscalls.list: Dup takes only one argument.
Reported by Greg McGary.
1997-02-21 00:22 Miles Bader <miles@gnu.ai.mit.edu>
1997-02-20 01:28 Miles Bader <miles@gnu.ai.mit.edu>
1997-02-19 13:56 Miles Bader <miles@gnu.ai.mit.edu>
1997-02-18 15:39 Miles Bader <miles@gnu.ai.mit.edu>
1997-02-17 10:58 Miles Bader <miles@gnu.ai.mit.edu>
1997-02-15 10:23 Miles Bader <miles@gnu.ai.mit.edu>
(mutex_lock, mutex_unlock, mutex_trylock): Defined in terms of
__mutex_*.
(mutex_t): Type removed & replaced by new macro.
(tsd_key_t): Typedef to int instead of pthread_key_t.
(tsd_key_create, tsd_setspecific, tsd_getspecific): New macros.
(__pthread_initialize): New macro, work around assumption of pthreads.
* sysdeps/mach/hurd/i386/init-first.c (__libc_argv, __libc_argc):
__hurd_sigthread_stack_end, __hurd_sigthread_stack_variables,
__hurd_threadvar_max, __hurd_threadvar_stack_offset,
__hurd_threadvar_stack_mask): Variables removed.
1997-02-14 14:07 Miles Bader <miles@gnu.ai.mit.edu>
* hurd/hurd.h (_hurd_pids_changed_stamp, _hurd_pids_changed_sync):
1997-02-24 17:06 Geoffrey Keating <geoffk@discus.anu.edu.au>
* sysdeps/unix/sysv/linux/accept.S (NARGS): Describe number of
arguments taken, for sysdeps/unix/sysv/linux/powerpc/socket.S.
* sysdeps/unix/sysv/linux/bind.S: Likewise.
* sysdeps/unix/sysv/linux/connect.S: Likewise.
* sysdeps/unix/sysv/linux/getpeername.S: Likewise.
* sysdeps/unix/sysv/linux/getsockname.S: Likewise.
* sysdeps/unix/sysv/linux/getsockopt.S: Likewise.
* sysdeps/unix/sysv/linux/listen.S: Likewise.
* sysdeps/unix/sysv/linux/recv.S: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S: Likewise.
* sysdeps/unix/sysv/linux/recvmsg.S: Likewise.
* sysdeps/unix/sysv/linux/send.S: Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S: Likewise.
* sysdeps/unix/sysv/linux/sendto.S: Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S: Likewise.
* sysdeps/unix/sysv/linux/shutdown.S: Likewise.
* sysdeps/unix/sysv/linux/socketpair.S: Likewise.
1997-02-15 04:51 Ulrich Drepper <drepper@cygnus.com>
1997-02-25 05:18:05 +00:00
|
|
|
|
2013-09-20 14:10:54 +00:00
|
|
|
LIBC_PROBE (memory_mallopt, 2, param_number, value);
|
|
|
|
|
2017-10-17 17:55:16 +00:00
|
|
|
/* We must consolidate main arena before changing max_fast
|
|
|
|
(see definition of set_max_fast). */
|
|
|
|
malloc_consolidate (av);
|
|
|
|
|
2019-12-03 22:44:36 +00:00
|
|
|
/* Many of these helper functions take a size_t. We do not worry
|
|
|
|
about overflow here, because negative int values will wrap to
|
|
|
|
very large size_t values and the helpers have sufficient range
|
|
|
|
checking for such conversions. Many of these helpers are also
|
|
|
|
used by the tunables macros in arena.c. */
|
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
switch (param_number)
|
|
|
|
{
|
|
|
|
case M_MXFAST:
|
2019-12-03 22:44:36 +00:00
|
|
|
res = do_set_mxfast (value);
|
2014-01-02 08:38:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case M_TRIM_THRESHOLD:
|
2019-12-03 22:44:36 +00:00
|
|
|
res = do_set_trim_threshold (value);
|
2014-01-02 08:38:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case M_TOP_PAD:
|
2019-12-03 22:44:36 +00:00
|
|
|
res = do_set_top_pad (value);
|
2014-01-02 08:38:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case M_MMAP_THRESHOLD:
|
2016-10-27 03:04:55 +00:00
|
|
|
res = do_set_mmap_threshold (value);
|
2014-01-02 08:38:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case M_MMAP_MAX:
|
2019-12-03 22:44:36 +00:00
|
|
|
res = do_set_mmaps_max (value);
|
2014-01-02 08:38:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case M_CHECK_ACTION:
|
2019-12-03 22:44:36 +00:00
|
|
|
res = do_set_mallopt_check (value);
|
2014-01-02 08:38:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case M_PERTURB:
|
2019-12-03 22:44:36 +00:00
|
|
|
res = do_set_perturb_byte (value);
|
2014-01-02 08:38:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case M_ARENA_TEST:
|
|
|
|
if (value > 0)
|
2019-12-03 22:44:36 +00:00
|
|
|
res = do_set_arena_test (value);
|
2014-01-02 08:38:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case M_ARENA_MAX:
|
|
|
|
if (value > 0)
|
2019-12-03 22:44:36 +00:00
|
|
|
res = do_set_arena_max (value);
|
2014-01-02 08:38:18 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_unlock (av->mutex);
|
2002-01-29 07:54:51 +00:00
|
|
|
return res;
|
1998-05-06 12:54:05 +00:00
|
|
|
}
|
2012-01-31 23:49:22 +00:00
|
|
|
libc_hidden_def (__libc_mallopt)
|
1998-05-06 12:54:05 +00:00
|
|
|
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2002-02-07 05:30:48 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
-------------------- Alternative MORECORE functions --------------------
|
|
|
|
*/
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
1998-05-06 12:54:05 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
2014-01-02 08:38:18 +00:00
|
|
|
General Requirements for MORECORE.
|
1998-05-06 12:54:05 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
The MORECORE function must have the following properties:
|
1998-05-06 12:54:05 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
If MORECORE_CONTIGUOUS is false:
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
* MORECORE must allocate in multiples of pagesize. It will
|
2002-01-29 07:54:51 +00:00
|
|
|
only be called with arguments that are multiples of pagesize.
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
* MORECORE(0) must return an address that is at least
|
2002-01-29 07:54:51 +00:00
|
|
|
MALLOC_ALIGNMENT aligned. (Page-aligning always suffices.)
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
else (i.e. If MORECORE_CONTIGUOUS is true):
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
* Consecutive calls to MORECORE with positive arguments
|
2002-01-29 07:54:51 +00:00
|
|
|
return increasing addresses, indicating that space has been
|
|
|
|
contiguously extended.
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
* MORECORE need not allocate in multiples of pagesize.
|
2002-01-29 07:54:51 +00:00
|
|
|
Calls to MORECORE need not have args of multiples of pagesize.
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
* MORECORE need not page-align.
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
In either case:
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
* MORECORE may allocate more memory than requested. (Or even less,
|
2002-01-29 07:54:51 +00:00
|
|
|
but this will generally result in a malloc failure.)
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
* MORECORE must not allocate memory when given argument zero, but
|
2002-01-29 07:54:51 +00:00
|
|
|
instead return one past the end address of memory from previous
|
|
|
|
nonzero call. This malloc does NOT call MORECORE(0)
|
|
|
|
until at least one call with positive arguments is made, so
|
|
|
|
the initial value returned is not important.
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
* Even though consecutive calls to MORECORE need not return contiguous
|
2002-01-29 07:54:51 +00:00
|
|
|
addresses, it must be OK for malloc'ed chunks to span multiple
|
|
|
|
regions in those cases where they do happen to be contiguous.
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
* MORECORE need not handle negative arguments -- it may instead
|
2002-01-29 07:54:51 +00:00
|
|
|
just return MORECORE_FAILURE when given negative arguments.
|
|
|
|
Negative arguments are always multiples of pagesize. MORECORE
|
|
|
|
must not misinterpret negative args as large positive unsigned
|
|
|
|
args. You can suppress all such calls from even occurring by defining
|
|
|
|
MORECORE_CANNOT_TRIM,
|
update from main archive 961217
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996.
The stream is private and usages outside glibc don't care about
reentrancy.
* io/fts.c: Likewise.
* io/ftw.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/posix/ttyname.c: Likewise.
* sysdeps/posix/ttyname_r.c: Likewise.
* sysdeps/posix/glob.c: Likewise.
* libio/iovsprintf.c: Add cast to prevent warning.
* libio/iovsscanf.c: Likewise.
* libio/libioP.h: Define mmap to __mmap and munmap to __munmap
to keep namespace clean.
* new-malloc/malloc.c: Update to last version from Wolfram Gloger.
Add hooks and check functions from old GNU malloc.
* new-malloc/malloc.h: Likewise.
* nis/ypclnt.c: Remove prototype for xdr_free.
* snrpc/rpc/xdr.h: Add prototype for xdr_free.
* manual/nss.texi: Correct description of default values and don't
meantion NSS as an add-on.
* nss/grp-lookup.c: Provide default value as
"compat [NOTFOUND=return] files".
* nss/pwd-lookup.c: Likewise.
* nss/spwd-lookup.c: Likewise.
* nss/network-lookup.c: Correct default to
"dns [!UNAVAIL=return] files".
* nss/nsswitch.c: Change default-default value to "nis
[NOTFOUND=return] files" since compat is only available for group,
passwd, and shadow.
* stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name
a weak alias.
* stdlib/stdlib.h: Add prototype for __on_exit.
* sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone.
* time/Makefile: Undo change from Sun Dec 8 06:56:49 1996.
The new malloc now has mcheck.
* time/ap.c: Likewise.
* time/tzset.c (__tzset): Rename to __tzset_internal.
(tzset): Rename to __tzset. Make tzset a weak alias for __tzset.
* time/localtime.c: Use __tzset_internal not __tzset.
* time/strftime.c [_LIBC]: Define tzname as __tzname and tzset
as __tzset to prevent namespace pollution.
* wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype
a weak alias of __iswctype.
* wctype/wctype.h: Add prototype for __iswctype.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph,
iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank):
Use __iswctype for the test, not iswctype.
1996-12-16 Paul Eggert <eggert@twinsun.com>
* hurd/hurd/sigpreempt.h
(struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors),
hurd/hurd/signal.h (struct hurd_sigstate.preemptors),
hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor),
hurd/hurdsig.c (_hurdsig_preempters):
Renamed to fix spelling from `preempter' to `preemptor'.
All uses changed.
1996-12-15 Paul Eggert <eggert@twinsun.com>
* ctime.c (ctime): Return asctime (localtime (t)), as the C
standard requires.
Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return
value because Mach/cthreads uses the opposite convention from
Posix/glibc.
Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/fcloseall.c: Correct test of already_called.
Reported by Thomas Bushnell, n/BSG.
Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* mach/lock-intern.h (__mutex_try_lock): New function.
Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if
defined, else XTABS.
(CEOL, CSTATUS): Use _POSIX_VDISABLE if defined.
Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/mremap.S: New file.
* sysdeps/unix/sysv/linux/m68k/Dist: Distribute it.
* sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
1996-12-18 03:23:47 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
There is some variation across systems about the type of the
|
|
|
|
argument to sbrk/MORECORE. If size_t is unsigned, then it cannot
|
|
|
|
actually be size_t, because sbrk supports negative args, so it is
|
|
|
|
normally the signed type of the same width as size_t (sometimes
|
|
|
|
declared as "intptr_t", and sometimes "ptrdiff_t"). It doesn't much
|
|
|
|
matter though. Internally, we use "long" as arguments, which should
|
|
|
|
work across all reasonable possibilities.
|
|
|
|
|
|
|
|
Additionally, if MORECORE ever returns failure for a positive
|
|
|
|
request, then mmap is used as a noncontiguous system allocator. This
|
|
|
|
is a useful backup strategy for systems with holes in address spaces
|
|
|
|
-- in this case sbrk cannot contiguously expand the heap, but mmap
|
|
|
|
may be able to map noncontiguous space.
|
|
|
|
|
|
|
|
If you'd like mmap to ALWAYS be used, you can define MORECORE to be
|
|
|
|
a function that always returns MORECORE_FAILURE.
|
|
|
|
|
|
|
|
If you are using this malloc with something other than sbrk (or its
|
|
|
|
emulation) to supply memory regions, you probably want to set
|
|
|
|
MORECORE_CONTIGUOUS as false. As an example, here is a custom
|
|
|
|
allocator kindly contributed for pre-OSX macOS. It uses virtually
|
|
|
|
but not necessarily physically contiguous non-paged memory (locked
|
|
|
|
in, present and won't get swapped out). You can use it by
|
|
|
|
uncommenting this section, adding some #includes, and setting up the
|
|
|
|
appropriate defines above:
|
|
|
|
|
|
|
|
*#define MORECORE osMoreCore
|
|
|
|
*#define MORECORE_CONTIGUOUS 0
|
|
|
|
|
|
|
|
There is also a shutdown routine that should somehow be called for
|
|
|
|
cleanup upon program exit.
|
|
|
|
|
|
|
|
*#define MAX_POOL_ENTRIES 100
|
|
|
|
*#define MINIMUM_MORECORE_SIZE (64 * 1024)
|
|
|
|
static int next_os_pool;
|
|
|
|
void *our_os_pools[MAX_POOL_ENTRIES];
|
|
|
|
|
|
|
|
void *osMoreCore(int size)
|
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
void *ptr = 0;
|
|
|
|
static void *sbrk_top = 0;
|
Update.
1997-08-14 03:14 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-minimal.c: Don't use relative #include paths.
(malloc): Don't try to initialize _dl_pagesize, it already is.
(__sigjmp_save, longjmp): Reformat.
* sysdeps/generic/dl-sysdep.c: Implement _dl_show_auxv function to
show content of auxiliary array.
(_dl_sysdep_start): Remember start of auxiliary vector.
* sysdeps/mach/hurd/dl-sysdep.c: (_dl_show_auxv): New dummy function.
* elf/link.h: Add prototype for _dl_show_auxv.
* elf/rtld.c (dl_main): Call _dl_show_auxv if LD_SHOW_AUXV envvar
is present.
* libio/iofdopen.c: Better prepare for use in libstdc++.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofopen.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* manual/creature.texi: Mention _XOPEN_SOURCE_EXTENDED in correct
place.
* manual/math.texi: Add comment to sincos decsription to say it's a
GNU extension.
Fix description of random function.
* posix/fnmatch.h: Recognize Windog by _WINDOWS32 not WIN32.
* posix/glob.c: Likewise. Handle stupid system headers on SunOS.
Add casts for all __alloca calls.
* posix/glob.h: Recognize Windog by _WINDOWS32 not WIN32.
Declare additional GLOB_* constants also if _GNU_SOURCE is defined.
Patches by Paul D. Smith <psmith@BayNetworks.COM>.
* stdio-common/_itoa.c: Don't use relateive #include paths.
* sysdeps/i386/fpu/bits/mathinline.h: Enable optimizations even for
gcc 2.7.
(atan): Loading 1.0 from memory does not pay off.
(asinh): Fix typo.
1997-08-13 09:44 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/stub/accept.c: Use socklen_t where necessary.
* sysdeps/stub/bind.c: Likewise.
* sysdeps/stub/connect.c: Likewise.
* sysdeps/stub/getsockname.c: Likewise.
* sysdeps/stub/getsockopt.c: Likewise.
* sysdeps/stub/recvfrom.c: Likewise.
* sysdeps/stub/sendto.c: Likewise.
* sysdeps/stub/setsockopt.c: Likewise.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* io/ftw.c (object_compare): Avoid memcmp when comparing scalar
types.
1997-08-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (cbrt_test): Add epsilon for long double to
`cbrt (-0.001)'.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/stub/bits/string.h: Fix comment.
1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/Makefile (routines): Remove dl-version.
(dl-routines): Add it here instead. This removes dead code from
libc.so.
1997-08-12 17:17 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/thread-m.h (thread_atfork, thread_atfork_static): New
macros to encapsulate pthread_atfork's functionality.
* malloc/malloc.c (ptmalloc_lock_all, ptmalloc_unlock_all): New
functions, registered via thread_atfork in the initialization
routine or via thread_atfork_static in global scope. This
ensures a consistent state of all locks across fork().
1997-08-11 23:00:32 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/programs/xtmp.c (compare_entry):
Partially undo patch made by Klaus Espenlaub. There
was no xtmp/utmp typo. Added comment to cclarify this.
* login/programs/xtmp.h: Likewise.
* posix/getopt.c: Recognize Windog by _WINDOWS32 not WIN32.
Patch by Paul D. Smith <psmith@BayNetworks.COM>.
1997-08-12 13:51 Ulrich Drepper <drepper@cygnus.com>
* login/getutid.c: Rename to __getutid and make getutid and getutxid
weak aliases.
Patch by ir. Mark M._Kettenis <kettenis@phys.uva.nl>.
1997-08-11 23:55 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
Add bits/mman.h.
1997-08-11 08:51:21 1997 H.J. Lu <hjl@gnu.ai.mit.edu>
* stdlib/fmtmsg.c (fmtmsg): Add static to
__libc_once_define macro.
* libc.map (__progname_full, __progname): Added.
1997-08-04 08:31 H.J. Lu <hjl@gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0
if SIOGIFINDEX is not defined.
(if_indextoname): Initialize "result" to NULL.
(if_nametoindex, if_nameindex): Fix ENOSYS setting.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc ISO C 9x exception handling:
* sysdeps/sparc/fpu/bits/mathdef.h: New file.
* sysdeps/sparc/fpu/fclrexcpt.c: New file.
* sysdeps/sparc/fpu/fegetenv.c: New file.
* sysdeps/sparc/fpu/fegetround.c: New file.
* sysdeps/sparc/fpu/feholdexcpt.c: New file.
* sysdeps/sparc/fpu/fesetenv.c: New file.
* sysdeps/sparc/fpu/fesetround.c: New file.
* sysdeps/sparc/fpu/feupdateenv.c: New file.
* sysdeps/sparc/fpu/fgetexcptflg.c: New file.
* sysdeps/sparc/fpu/fraiseexcpt.c: New file.
* sysdeps/sparc/fpu/fsetexcptflg.c: New file.
* sysdeps/sparc/fpu/ftestexcept.c: New file.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: New file.
* sysdeps/sparc/sparc64/fpu/bits/fenv.h: New file.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc64 merge:
* configure.in: Change up subdirectories, rename sparc8->sparcv8.
* csu/Makefile: Nuke need-nopic-initfini bits. The problem was
that sparc64 ld did not recognize pic relocs at all.
* elf/dl-deps.c: Include <string.h>.
* elf/do-rel.h (elf_dynamic_do_rel): Take reloc address and size
directly instead of the DT names to get them from.
* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): New macro distilled
from ELF_DYNAMIC_DO_REL{,A}. Define a second version that accounts
for the possibility that DT_RELA and DT_JMPPLT overlap, as such is
the case on the Sparc.
* elf/elf.h: Stub out Elf64_Ver*, and make them the same as the
Elf32_Ver* bits. The linker does not even know to differentiate
between the word sizes. Someone should examine this and figure
out what the proper sizes of things should be for 64-bit hosts
before the sparc64 libraries are distributed.
* shlib-versions: Rename sparc64 ld.so to not conflict with sparc32
on the same machine.
Move old sysdeps/sparc contents to sysdeps/sparc/sparc32,
rename sparc8 subdir to sparcv8, move sysdeps/sparc64 content to
sysdeps/sparc/sparc64. Same for sysdeps/unix/sysv/linux/sparc.
* sysdeps/sparc/Implies: Do ieee754 here.
* sysdeps/sparc/configure.in: Move from sparc32/.
* sysdeps/sparc/sparc32/Implies: Do wordsize here.
* sysdeps/sparc/sparc64/Implies: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_load_address):
Use uninitialized .got to find load address instead of AT_BASE, as
the later does not exist when running ld.so directly.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Move from ../.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Clean up PIC support.
* sysdeps/sparc/sparc64/Makefile (sysdep_routines): Add s_finitel
and s_signbitl for stdio.
* sysdeps/sparc/sparc64/configure.in: Remove, we no longer need
nopic_initfini.
* sysdeps/sparc/sparc64/bsd-_setjmp.S: Remove.
* sysdeps/sparc/sparc64/bsd-setjmp.S: Remove.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-_setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add __longjmp alias.
* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Add weak _setjmp
and setjmp entry points.
* sysdeps/sparc/sparc64/dl-machine.h: Finish real implementation.
* sysdeps/sparc/sparc64/elf/crtbegin.S: Add copyright, fix PIC.
* sysdeps/sparc/sparc64/elf/crtend.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h (struct sigaction):
Fix sa_flags size for sparc64; add sa_restorer for kernel.
* sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Fix PIC.
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscall.S: New file.
1997-08-10 18:29:08 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/login.c (login): Check for correct return value of
utmpname.
1997-08-11 16:49 Ulrich Drepper <drepper@cygnus.com>
* time/tzset.c (__tzset_internal): Correctly handle TZ strings
following incorrect old POSIX specs.
Patch by Paul Eggert <eggert@twinsun.com>.
* sysdeps/generic/bits/sigaction.h: Correct comment for SA_RESTART.
* sysdeps/unix/bsd/osf/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/minix/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/sigaction.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/math.texi: Define the macros @mul and @infinity and use
them to format the multiplication and infinity signs.
(FP Comparison Functions): Use @code, not @math, for C code
examples.
* elf/dl-profile.c: Add descriptions and implement reading of
1997-08-14 01:54:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
if (size > 0)
|
|
|
|
{
|
|
|
|
if (size < MINIMUM_MORECORE_SIZE)
|
2014-01-02 08:38:18 +00:00
|
|
|
size = MINIMUM_MORECORE_SIZE;
|
2002-01-29 07:54:51 +00:00
|
|
|
if (CurrentExecutionLevel() == kTaskLevel)
|
2014-01-02 08:38:18 +00:00
|
|
|
ptr = PoolAllocateResident(size + RM_PAGE_SIZE, 0);
|
2002-01-29 07:54:51 +00:00
|
|
|
if (ptr == 0)
|
|
|
|
{
|
2014-01-02 08:38:18 +00:00
|
|
|
return (void *) MORECORE_FAILURE;
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
|
|
|
// save ptrs so they can be freed during cleanup
|
|
|
|
our_os_pools[next_os_pool] = ptr;
|
|
|
|
next_os_pool++;
|
|
|
|
ptr = (void *) ((((unsigned long) ptr) + RM_PAGE_MASK) & ~RM_PAGE_MASK);
|
|
|
|
sbrk_top = (char *) ptr + size;
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
else if (size < 0)
|
|
|
|
{
|
|
|
|
// we don't currently support shrink behavior
|
|
|
|
return (void *) MORECORE_FAILURE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return sbrk_top;
|
1999-05-17 10:09:50 +00:00
|
|
|
}
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
Update.
1997-08-14 03:14 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-minimal.c: Don't use relative #include paths.
(malloc): Don't try to initialize _dl_pagesize, it already is.
(__sigjmp_save, longjmp): Reformat.
* sysdeps/generic/dl-sysdep.c: Implement _dl_show_auxv function to
show content of auxiliary array.
(_dl_sysdep_start): Remember start of auxiliary vector.
* sysdeps/mach/hurd/dl-sysdep.c: (_dl_show_auxv): New dummy function.
* elf/link.h: Add prototype for _dl_show_auxv.
* elf/rtld.c (dl_main): Call _dl_show_auxv if LD_SHOW_AUXV envvar
is present.
* libio/iofdopen.c: Better prepare for use in libstdc++.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofopen.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* manual/creature.texi: Mention _XOPEN_SOURCE_EXTENDED in correct
place.
* manual/math.texi: Add comment to sincos decsription to say it's a
GNU extension.
Fix description of random function.
* posix/fnmatch.h: Recognize Windog by _WINDOWS32 not WIN32.
* posix/glob.c: Likewise. Handle stupid system headers on SunOS.
Add casts for all __alloca calls.
* posix/glob.h: Recognize Windog by _WINDOWS32 not WIN32.
Declare additional GLOB_* constants also if _GNU_SOURCE is defined.
Patches by Paul D. Smith <psmith@BayNetworks.COM>.
* stdio-common/_itoa.c: Don't use relateive #include paths.
* sysdeps/i386/fpu/bits/mathinline.h: Enable optimizations even for
gcc 2.7.
(atan): Loading 1.0 from memory does not pay off.
(asinh): Fix typo.
1997-08-13 09:44 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/stub/accept.c: Use socklen_t where necessary.
* sysdeps/stub/bind.c: Likewise.
* sysdeps/stub/connect.c: Likewise.
* sysdeps/stub/getsockname.c: Likewise.
* sysdeps/stub/getsockopt.c: Likewise.
* sysdeps/stub/recvfrom.c: Likewise.
* sysdeps/stub/sendto.c: Likewise.
* sysdeps/stub/setsockopt.c: Likewise.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* io/ftw.c (object_compare): Avoid memcmp when comparing scalar
types.
1997-08-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (cbrt_test): Add epsilon for long double to
`cbrt (-0.001)'.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/stub/bits/string.h: Fix comment.
1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/Makefile (routines): Remove dl-version.
(dl-routines): Add it here instead. This removes dead code from
libc.so.
1997-08-12 17:17 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/thread-m.h (thread_atfork, thread_atfork_static): New
macros to encapsulate pthread_atfork's functionality.
* malloc/malloc.c (ptmalloc_lock_all, ptmalloc_unlock_all): New
functions, registered via thread_atfork in the initialization
routine or via thread_atfork_static in global scope. This
ensures a consistent state of all locks across fork().
1997-08-11 23:00:32 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/programs/xtmp.c (compare_entry):
Partially undo patch made by Klaus Espenlaub. There
was no xtmp/utmp typo. Added comment to cclarify this.
* login/programs/xtmp.h: Likewise.
* posix/getopt.c: Recognize Windog by _WINDOWS32 not WIN32.
Patch by Paul D. Smith <psmith@BayNetworks.COM>.
1997-08-12 13:51 Ulrich Drepper <drepper@cygnus.com>
* login/getutid.c: Rename to __getutid and make getutid and getutxid
weak aliases.
Patch by ir. Mark M._Kettenis <kettenis@phys.uva.nl>.
1997-08-11 23:55 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
Add bits/mman.h.
1997-08-11 08:51:21 1997 H.J. Lu <hjl@gnu.ai.mit.edu>
* stdlib/fmtmsg.c (fmtmsg): Add static to
__libc_once_define macro.
* libc.map (__progname_full, __progname): Added.
1997-08-04 08:31 H.J. Lu <hjl@gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0
if SIOGIFINDEX is not defined.
(if_indextoname): Initialize "result" to NULL.
(if_nametoindex, if_nameindex): Fix ENOSYS setting.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc ISO C 9x exception handling:
* sysdeps/sparc/fpu/bits/mathdef.h: New file.
* sysdeps/sparc/fpu/fclrexcpt.c: New file.
* sysdeps/sparc/fpu/fegetenv.c: New file.
* sysdeps/sparc/fpu/fegetround.c: New file.
* sysdeps/sparc/fpu/feholdexcpt.c: New file.
* sysdeps/sparc/fpu/fesetenv.c: New file.
* sysdeps/sparc/fpu/fesetround.c: New file.
* sysdeps/sparc/fpu/feupdateenv.c: New file.
* sysdeps/sparc/fpu/fgetexcptflg.c: New file.
* sysdeps/sparc/fpu/fraiseexcpt.c: New file.
* sysdeps/sparc/fpu/fsetexcptflg.c: New file.
* sysdeps/sparc/fpu/ftestexcept.c: New file.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: New file.
* sysdeps/sparc/sparc64/fpu/bits/fenv.h: New file.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc64 merge:
* configure.in: Change up subdirectories, rename sparc8->sparcv8.
* csu/Makefile: Nuke need-nopic-initfini bits. The problem was
that sparc64 ld did not recognize pic relocs at all.
* elf/dl-deps.c: Include <string.h>.
* elf/do-rel.h (elf_dynamic_do_rel): Take reloc address and size
directly instead of the DT names to get them from.
* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): New macro distilled
from ELF_DYNAMIC_DO_REL{,A}. Define a second version that accounts
for the possibility that DT_RELA and DT_JMPPLT overlap, as such is
the case on the Sparc.
* elf/elf.h: Stub out Elf64_Ver*, and make them the same as the
Elf32_Ver* bits. The linker does not even know to differentiate
between the word sizes. Someone should examine this and figure
out what the proper sizes of things should be for 64-bit hosts
before the sparc64 libraries are distributed.
* shlib-versions: Rename sparc64 ld.so to not conflict with sparc32
on the same machine.
Move old sysdeps/sparc contents to sysdeps/sparc/sparc32,
rename sparc8 subdir to sparcv8, move sysdeps/sparc64 content to
sysdeps/sparc/sparc64. Same for sysdeps/unix/sysv/linux/sparc.
* sysdeps/sparc/Implies: Do ieee754 here.
* sysdeps/sparc/configure.in: Move from sparc32/.
* sysdeps/sparc/sparc32/Implies: Do wordsize here.
* sysdeps/sparc/sparc64/Implies: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_load_address):
Use uninitialized .got to find load address instead of AT_BASE, as
the later does not exist when running ld.so directly.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Move from ../.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Clean up PIC support.
* sysdeps/sparc/sparc64/Makefile (sysdep_routines): Add s_finitel
and s_signbitl for stdio.
* sysdeps/sparc/sparc64/configure.in: Remove, we no longer need
nopic_initfini.
* sysdeps/sparc/sparc64/bsd-_setjmp.S: Remove.
* sysdeps/sparc/sparc64/bsd-setjmp.S: Remove.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-_setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add __longjmp alias.
* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Add weak _setjmp
and setjmp entry points.
* sysdeps/sparc/sparc64/dl-machine.h: Finish real implementation.
* sysdeps/sparc/sparc64/elf/crtbegin.S: Add copyright, fix PIC.
* sysdeps/sparc/sparc64/elf/crtend.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h (struct sigaction):
Fix sa_flags size for sparc64; add sa_restorer for kernel.
* sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Fix PIC.
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscall.S: New file.
1997-08-10 18:29:08 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/login.c (login): Check for correct return value of
utmpname.
1997-08-11 16:49 Ulrich Drepper <drepper@cygnus.com>
* time/tzset.c (__tzset_internal): Correctly handle TZ strings
following incorrect old POSIX specs.
Patch by Paul Eggert <eggert@twinsun.com>.
* sysdeps/generic/bits/sigaction.h: Correct comment for SA_RESTART.
* sysdeps/unix/bsd/osf/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/minix/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/sigaction.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/math.texi: Define the macros @mul and @infinity and use
them to format the multiplication and infinity signs.
(FP Comparison Functions): Use @code, not @math, for C code
examples.
* elf/dl-profile.c: Add descriptions and implement reading of
1997-08-14 01:54:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
// cleanup any allocated memory pools
|
|
|
|
// called as last thing before shutting down driver
|
Update.
1997-08-14 03:14 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-minimal.c: Don't use relative #include paths.
(malloc): Don't try to initialize _dl_pagesize, it already is.
(__sigjmp_save, longjmp): Reformat.
* sysdeps/generic/dl-sysdep.c: Implement _dl_show_auxv function to
show content of auxiliary array.
(_dl_sysdep_start): Remember start of auxiliary vector.
* sysdeps/mach/hurd/dl-sysdep.c: (_dl_show_auxv): New dummy function.
* elf/link.h: Add prototype for _dl_show_auxv.
* elf/rtld.c (dl_main): Call _dl_show_auxv if LD_SHOW_AUXV envvar
is present.
* libio/iofdopen.c: Better prepare for use in libstdc++.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofopen.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* manual/creature.texi: Mention _XOPEN_SOURCE_EXTENDED in correct
place.
* manual/math.texi: Add comment to sincos decsription to say it's a
GNU extension.
Fix description of random function.
* posix/fnmatch.h: Recognize Windog by _WINDOWS32 not WIN32.
* posix/glob.c: Likewise. Handle stupid system headers on SunOS.
Add casts for all __alloca calls.
* posix/glob.h: Recognize Windog by _WINDOWS32 not WIN32.
Declare additional GLOB_* constants also if _GNU_SOURCE is defined.
Patches by Paul D. Smith <psmith@BayNetworks.COM>.
* stdio-common/_itoa.c: Don't use relateive #include paths.
* sysdeps/i386/fpu/bits/mathinline.h: Enable optimizations even for
gcc 2.7.
(atan): Loading 1.0 from memory does not pay off.
(asinh): Fix typo.
1997-08-13 09:44 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/stub/accept.c: Use socklen_t where necessary.
* sysdeps/stub/bind.c: Likewise.
* sysdeps/stub/connect.c: Likewise.
* sysdeps/stub/getsockname.c: Likewise.
* sysdeps/stub/getsockopt.c: Likewise.
* sysdeps/stub/recvfrom.c: Likewise.
* sysdeps/stub/sendto.c: Likewise.
* sysdeps/stub/setsockopt.c: Likewise.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* io/ftw.c (object_compare): Avoid memcmp when comparing scalar
types.
1997-08-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (cbrt_test): Add epsilon for long double to
`cbrt (-0.001)'.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/stub/bits/string.h: Fix comment.
1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/Makefile (routines): Remove dl-version.
(dl-routines): Add it here instead. This removes dead code from
libc.so.
1997-08-12 17:17 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/thread-m.h (thread_atfork, thread_atfork_static): New
macros to encapsulate pthread_atfork's functionality.
* malloc/malloc.c (ptmalloc_lock_all, ptmalloc_unlock_all): New
functions, registered via thread_atfork in the initialization
routine or via thread_atfork_static in global scope. This
ensures a consistent state of all locks across fork().
1997-08-11 23:00:32 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/programs/xtmp.c (compare_entry):
Partially undo patch made by Klaus Espenlaub. There
was no xtmp/utmp typo. Added comment to cclarify this.
* login/programs/xtmp.h: Likewise.
* posix/getopt.c: Recognize Windog by _WINDOWS32 not WIN32.
Patch by Paul D. Smith <psmith@BayNetworks.COM>.
1997-08-12 13:51 Ulrich Drepper <drepper@cygnus.com>
* login/getutid.c: Rename to __getutid and make getutid and getutxid
weak aliases.
Patch by ir. Mark M._Kettenis <kettenis@phys.uva.nl>.
1997-08-11 23:55 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
Add bits/mman.h.
1997-08-11 08:51:21 1997 H.J. Lu <hjl@gnu.ai.mit.edu>
* stdlib/fmtmsg.c (fmtmsg): Add static to
__libc_once_define macro.
* libc.map (__progname_full, __progname): Added.
1997-08-04 08:31 H.J. Lu <hjl@gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0
if SIOGIFINDEX is not defined.
(if_indextoname): Initialize "result" to NULL.
(if_nametoindex, if_nameindex): Fix ENOSYS setting.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc ISO C 9x exception handling:
* sysdeps/sparc/fpu/bits/mathdef.h: New file.
* sysdeps/sparc/fpu/fclrexcpt.c: New file.
* sysdeps/sparc/fpu/fegetenv.c: New file.
* sysdeps/sparc/fpu/fegetround.c: New file.
* sysdeps/sparc/fpu/feholdexcpt.c: New file.
* sysdeps/sparc/fpu/fesetenv.c: New file.
* sysdeps/sparc/fpu/fesetround.c: New file.
* sysdeps/sparc/fpu/feupdateenv.c: New file.
* sysdeps/sparc/fpu/fgetexcptflg.c: New file.
* sysdeps/sparc/fpu/fraiseexcpt.c: New file.
* sysdeps/sparc/fpu/fsetexcptflg.c: New file.
* sysdeps/sparc/fpu/ftestexcept.c: New file.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: New file.
* sysdeps/sparc/sparc64/fpu/bits/fenv.h: New file.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc64 merge:
* configure.in: Change up subdirectories, rename sparc8->sparcv8.
* csu/Makefile: Nuke need-nopic-initfini bits. The problem was
that sparc64 ld did not recognize pic relocs at all.
* elf/dl-deps.c: Include <string.h>.
* elf/do-rel.h (elf_dynamic_do_rel): Take reloc address and size
directly instead of the DT names to get them from.
* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): New macro distilled
from ELF_DYNAMIC_DO_REL{,A}. Define a second version that accounts
for the possibility that DT_RELA and DT_JMPPLT overlap, as such is
the case on the Sparc.
* elf/elf.h: Stub out Elf64_Ver*, and make them the same as the
Elf32_Ver* bits. The linker does not even know to differentiate
between the word sizes. Someone should examine this and figure
out what the proper sizes of things should be for 64-bit hosts
before the sparc64 libraries are distributed.
* shlib-versions: Rename sparc64 ld.so to not conflict with sparc32
on the same machine.
Move old sysdeps/sparc contents to sysdeps/sparc/sparc32,
rename sparc8 subdir to sparcv8, move sysdeps/sparc64 content to
sysdeps/sparc/sparc64. Same for sysdeps/unix/sysv/linux/sparc.
* sysdeps/sparc/Implies: Do ieee754 here.
* sysdeps/sparc/configure.in: Move from sparc32/.
* sysdeps/sparc/sparc32/Implies: Do wordsize here.
* sysdeps/sparc/sparc64/Implies: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_load_address):
Use uninitialized .got to find load address instead of AT_BASE, as
the later does not exist when running ld.so directly.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Move from ../.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Clean up PIC support.
* sysdeps/sparc/sparc64/Makefile (sysdep_routines): Add s_finitel
and s_signbitl for stdio.
* sysdeps/sparc/sparc64/configure.in: Remove, we no longer need
nopic_initfini.
* sysdeps/sparc/sparc64/bsd-_setjmp.S: Remove.
* sysdeps/sparc/sparc64/bsd-setjmp.S: Remove.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-_setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add __longjmp alias.
* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Add weak _setjmp
and setjmp entry points.
* sysdeps/sparc/sparc64/dl-machine.h: Finish real implementation.
* sysdeps/sparc/sparc64/elf/crtbegin.S: Add copyright, fix PIC.
* sysdeps/sparc/sparc64/elf/crtend.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h (struct sigaction):
Fix sa_flags size for sparc64; add sa_restorer for kernel.
* sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Fix PIC.
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscall.S: New file.
1997-08-10 18:29:08 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/login.c (login): Check for correct return value of
utmpname.
1997-08-11 16:49 Ulrich Drepper <drepper@cygnus.com>
* time/tzset.c (__tzset_internal): Correctly handle TZ strings
following incorrect old POSIX specs.
Patch by Paul Eggert <eggert@twinsun.com>.
* sysdeps/generic/bits/sigaction.h: Correct comment for SA_RESTART.
* sysdeps/unix/bsd/osf/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/minix/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/sigaction.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/math.texi: Define the macros @mul and @infinity and use
them to format the multiplication and infinity signs.
(FP Comparison Functions): Use @code, not @math, for C code
examples.
* elf/dl-profile.c: Add descriptions and implement reading of
1997-08-14 01:54:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
void osCleanupMem(void)
|
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
void **ptr;
|
Update.
1997-08-14 03:14 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-minimal.c: Don't use relative #include paths.
(malloc): Don't try to initialize _dl_pagesize, it already is.
(__sigjmp_save, longjmp): Reformat.
* sysdeps/generic/dl-sysdep.c: Implement _dl_show_auxv function to
show content of auxiliary array.
(_dl_sysdep_start): Remember start of auxiliary vector.
* sysdeps/mach/hurd/dl-sysdep.c: (_dl_show_auxv): New dummy function.
* elf/link.h: Add prototype for _dl_show_auxv.
* elf/rtld.c (dl_main): Call _dl_show_auxv if LD_SHOW_AUXV envvar
is present.
* libio/iofdopen.c: Better prepare for use in libstdc++.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofopen.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* manual/creature.texi: Mention _XOPEN_SOURCE_EXTENDED in correct
place.
* manual/math.texi: Add comment to sincos decsription to say it's a
GNU extension.
Fix description of random function.
* posix/fnmatch.h: Recognize Windog by _WINDOWS32 not WIN32.
* posix/glob.c: Likewise. Handle stupid system headers on SunOS.
Add casts for all __alloca calls.
* posix/glob.h: Recognize Windog by _WINDOWS32 not WIN32.
Declare additional GLOB_* constants also if _GNU_SOURCE is defined.
Patches by Paul D. Smith <psmith@BayNetworks.COM>.
* stdio-common/_itoa.c: Don't use relateive #include paths.
* sysdeps/i386/fpu/bits/mathinline.h: Enable optimizations even for
gcc 2.7.
(atan): Loading 1.0 from memory does not pay off.
(asinh): Fix typo.
1997-08-13 09:44 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/stub/accept.c: Use socklen_t where necessary.
* sysdeps/stub/bind.c: Likewise.
* sysdeps/stub/connect.c: Likewise.
* sysdeps/stub/getsockname.c: Likewise.
* sysdeps/stub/getsockopt.c: Likewise.
* sysdeps/stub/recvfrom.c: Likewise.
* sysdeps/stub/sendto.c: Likewise.
* sysdeps/stub/setsockopt.c: Likewise.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* io/ftw.c (object_compare): Avoid memcmp when comparing scalar
types.
1997-08-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (cbrt_test): Add epsilon for long double to
`cbrt (-0.001)'.
1997-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/stub/bits/string.h: Fix comment.
1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/Makefile (routines): Remove dl-version.
(dl-routines): Add it here instead. This removes dead code from
libc.so.
1997-08-12 17:17 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/thread-m.h (thread_atfork, thread_atfork_static): New
macros to encapsulate pthread_atfork's functionality.
* malloc/malloc.c (ptmalloc_lock_all, ptmalloc_unlock_all): New
functions, registered via thread_atfork in the initialization
routine or via thread_atfork_static in global scope. This
ensures a consistent state of all locks across fork().
1997-08-11 23:00:32 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/programs/xtmp.c (compare_entry):
Partially undo patch made by Klaus Espenlaub. There
was no xtmp/utmp typo. Added comment to cclarify this.
* login/programs/xtmp.h: Likewise.
* posix/getopt.c: Recognize Windog by _WINDOWS32 not WIN32.
Patch by Paul D. Smith <psmith@BayNetworks.COM>.
1997-08-12 13:51 Ulrich Drepper <drepper@cygnus.com>
* login/getutid.c: Rename to __getutid and make getutid and getutxid
weak aliases.
Patch by ir. Mark M._Kettenis <kettenis@phys.uva.nl>.
1997-08-11 23:55 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
Add bits/mman.h.
1997-08-11 08:51:21 1997 H.J. Lu <hjl@gnu.ai.mit.edu>
* stdlib/fmtmsg.c (fmtmsg): Add static to
__libc_once_define macro.
* libc.map (__progname_full, __progname): Added.
1997-08-04 08:31 H.J. Lu <hjl@gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0
if SIOGIFINDEX is not defined.
(if_indextoname): Initialize "result" to NULL.
(if_nametoindex, if_nameindex): Fix ENOSYS setting.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc ISO C 9x exception handling:
* sysdeps/sparc/fpu/bits/mathdef.h: New file.
* sysdeps/sparc/fpu/fclrexcpt.c: New file.
* sysdeps/sparc/fpu/fegetenv.c: New file.
* sysdeps/sparc/fpu/fegetround.c: New file.
* sysdeps/sparc/fpu/feholdexcpt.c: New file.
* sysdeps/sparc/fpu/fesetenv.c: New file.
* sysdeps/sparc/fpu/fesetround.c: New file.
* sysdeps/sparc/fpu/feupdateenv.c: New file.
* sysdeps/sparc/fpu/fgetexcptflg.c: New file.
* sysdeps/sparc/fpu/fraiseexcpt.c: New file.
* sysdeps/sparc/fpu/fsetexcptflg.c: New file.
* sysdeps/sparc/fpu/ftestexcept.c: New file.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: New file.
* sysdeps/sparc/sparc64/fpu/bits/fenv.h: New file.
1997-08-11 11:58 Richard Henderson <rth@cygnus.com>
Sparc64 merge:
* configure.in: Change up subdirectories, rename sparc8->sparcv8.
* csu/Makefile: Nuke need-nopic-initfini bits. The problem was
that sparc64 ld did not recognize pic relocs at all.
* elf/dl-deps.c: Include <string.h>.
* elf/do-rel.h (elf_dynamic_do_rel): Take reloc address and size
directly instead of the DT names to get them from.
* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): New macro distilled
from ELF_DYNAMIC_DO_REL{,A}. Define a second version that accounts
for the possibility that DT_RELA and DT_JMPPLT overlap, as such is
the case on the Sparc.
* elf/elf.h: Stub out Elf64_Ver*, and make them the same as the
Elf32_Ver* bits. The linker does not even know to differentiate
between the word sizes. Someone should examine this and figure
out what the proper sizes of things should be for 64-bit hosts
before the sparc64 libraries are distributed.
* shlib-versions: Rename sparc64 ld.so to not conflict with sparc32
on the same machine.
Move old sysdeps/sparc contents to sysdeps/sparc/sparc32,
rename sparc8 subdir to sparcv8, move sysdeps/sparc64 content to
sysdeps/sparc/sparc64. Same for sysdeps/unix/sysv/linux/sparc.
* sysdeps/sparc/Implies: Do ieee754 here.
* sysdeps/sparc/configure.in: Move from sparc32/.
* sysdeps/sparc/sparc32/Implies: Do wordsize here.
* sysdeps/sparc/sparc64/Implies: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_load_address):
Use uninitialized .got to find load address instead of AT_BASE, as
the later does not exist when running ld.so directly.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Move from ../.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Clean up PIC support.
* sysdeps/sparc/sparc64/Makefile (sysdep_routines): Add s_finitel
and s_signbitl for stdio.
* sysdeps/sparc/sparc64/configure.in: Remove, we no longer need
nopic_initfini.
* sysdeps/sparc/sparc64/bsd-_setjmp.S: Remove.
* sysdeps/sparc/sparc64/bsd-setjmp.S: Remove.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-_setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/bsd-setjmp.S: New empty file.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add __longjmp alias.
* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Add weak _setjmp
and setjmp entry points.
* sysdeps/sparc/sparc64/dl-machine.h: Finish real implementation.
* sysdeps/sparc/sparc64/elf/crtbegin.S: Add copyright, fix PIC.
* sysdeps/sparc/sparc64/elf/crtend.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h (struct sigaction):
Fix sa_flags size for sparc64; add sa_restorer for kernel.
* sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Fix PIC.
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscall.S: New file.
1997-08-10 18:29:08 1997 Mark Kettenis <kettenis@phys.uva.nl>
* login/login.c (login): Check for correct return value of
utmpname.
1997-08-11 16:49 Ulrich Drepper <drepper@cygnus.com>
* time/tzset.c (__tzset_internal): Correctly handle TZ strings
following incorrect old POSIX specs.
Patch by Paul Eggert <eggert@twinsun.com>.
* sysdeps/generic/bits/sigaction.h: Correct comment for SA_RESTART.
* sysdeps/unix/bsd/osf/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/minix/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/sigaction.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/math.texi: Define the macros @mul and @infinity and use
them to format the multiplication and infinity signs.
(FP Comparison Functions): Use @code, not @math, for C code
examples.
* elf/dl-profile.c: Add descriptions and implement reading of
1997-08-14 01:54:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
for (ptr = our_os_pools; ptr < &our_os_pools[MAX_POOL_ENTRIES]; ptr++)
|
|
|
|
if (*ptr)
|
|
|
|
{
|
2014-01-02 08:38:18 +00:00
|
|
|
PoolDeallocate(*ptr);
|
|
|
|
* ptr = 0;
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
2014-01-02 08:38:18 +00:00
|
|
|
}
|
1998-05-12 12:22:17 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
1996-12-08 08:01:13 +00:00
|
|
|
|
update from main archive 961220
Sat Dec 21 04:14:16 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/common/pause.c: Add missing second argument in
call to __sigpause.
Reported by a sun <asun@zoology.washington.edu>.
* locale/weight.h: Correct handling of collation elements.
Reported by Keld Simonsen <keld@dkuug.dk>.
* manual/time.texi: Document ^ flag and %P format.
* new-malloc/malloc.c: Update from Wolfram Gloger.
* nss/nss.h: Reformat copyright.
* posix/sched.h: Likewise.
* sysdeps/i386/fpu_control.h: Likewise.
* sysdeps/unix/sysv/linux/fcntlbits.h: Likewise.
* sysdeps/unix/sysv/linux/ioctls.h: Likewise.
* sysdeps/unix/sysv/linux/sigcontext.h: Likewise.
* sysdeps/unix/sysv/linux/utsnamelen.h: Likewise.
* sysdeps/unix/sysv/linux/sys/acct.h: Likewise.
* sysvips/sys/msg.h: Likewise.
* stdio-common/Makefile (routines): Remove fcloseall.
* stdio-common/fcloseall.c: Removed.
* stdlib/Makefile (distribute): Add abort-instr.h.
* sysdeps/generic/abort-instr.h: New file.
* sysdeps/i386/abort-instr.h: New file.
* sysdeps/generic/abort.c: Use lock and stage counter to prevent
any form of loop.
* sysdeps/unix/sysv/linux/timebits.h: Define CLK_TCK as 100.
* sysdeps/unix/sysv/linux/alpha/timebits.h: Define CLOCKS_PER_SEC
as 1000000. Define CLK_TCK as 1024.
* time/time.c (CLK_TCK): Define only if not already set.
* time/strftime.c: Don't use `isdigit' when computing field width
from string since the locale might have more than one digit
block.
Fri Dec 20 12:38:14 1996 Darrel Hankerson <hankedr@mail.auburn.edu>
* posix/getopt.c (in -W option handling): Return when optind == argc.
Thu Dec 19 14:24:50 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* nis/nss_nis/nis-alias.c (_nss_nis_parse_aliasent): Add const to
type of KEY.
* nis/nss_compat/compat-grp.c: Include the declaration of the file
parser.
* nis/nss_compat/compat-pwd.c: Likewise.
* nis/nss_compat/compat-spwd.c: Likewise.
* nis/nss_nis/nis-ethers.c: Likewise.
* nis/nss_nis/nis-grp.c: Likewise.
* nis/nss_nis/nis-network.c: Likewise.
* nis/nss_nis/nis-proto.c: Likewise.
* nis/nss_nis/nis-pwd.c: Likewise.
* nis/nss_nis/nis-rpc.c: Likewise.
* nis/nss_nis/nis-spwd.c: Likewise.
* nis/nss_compat/compat-grp.c (getgrent_next_nis,
getgrent_next_file): Pass the correct type for the buffer to the
parser function.
* nis/nss_compat/compat-pwd.c (getpwent_next_netgr,
getpwent_next_nis, getpwent_next_file): Likewise.
* nis/nss_compat/compat-spwd.c (getspent_next_netgr,
getspent_next_nis, getspent_next_file): Likewise.
* nis/nss_nis/nis-ethers.c (internal_nis_getetherent_r,
_nss_nis_getethernam_r, _nss_nis_getetherbyaddr_r): Likewise.
* nis/nss_nis/nis-grp.c (internal_nis_getgrent_r,
_nss_nis_getgrnam_r, _nss_nis_getgrgid_r): Likewise.
* nis/nss_nis/nis-network.c (internal_nis_getnetent_r,
_nss_nis_getnetbyname_r, _nss_nis_getnetbyaddr_r): Likewise.
* nis/nss_nis/nis-proto.c (internal_nis_getprotoent_r,
_nss_nis_getprotobyname_r, _nss_nis_getprotobynumber_r): Likewise.
* nis/nss_nis/nis-pwd.c (internal_nis_getpwent_r,
_nss_nis_getpwnam_r, _nss_nis_getpwuid_r): Likewise.
* nis/nss_nis/nis-rpc.c (internal_nis_getrpcent_r,
_nss_nis_getrpcbynumber_r): Likewise.
* nis/nss_nis/nis-spwd.c (internal_nis_getspent_r,
_nss_nis_getspnam_r): Likewise.
Thu Dec 19 13:37:16 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/setjmp.c: New file.
1996-12-21 04:13:58 +00:00
|
|
|
|
2004-08-21 20:19:54 +00:00
|
|
|
/* Helper code. */
|
|
|
|
|
2005-01-07 21:49:38 +00:00
|
|
|
extern char **__libc_argv attribute_hidden;
|
|
|
|
|
2004-08-21 20:19:54 +00:00
|
|
|
static void
|
2017-08-30 17:29:38 +00:00
|
|
|
malloc_printerr (const char *str)
|
2004-08-21 20:19:54 +00:00
|
|
|
{
|
2017-08-30 14:39:41 +00:00
|
|
|
__libc_message (do_abort, "%s\n", str);
|
|
|
|
__builtin_unreachable ();
|
2004-08-21 20:19:54 +00:00
|
|
|
}
|
|
|
|
|
2000-04-14 17:42:46 +00:00
|
|
|
/* We need a wrapper function for one of the additions of POSIX. */
|
|
|
|
int
|
|
|
|
__posix_memalign (void **memptr, size_t alignment, size_t size)
|
|
|
|
{
|
|
|
|
void *mem;
|
|
|
|
|
|
|
|
/* Test whether the SIZE argument is valid. It must be a power of
|
|
|
|
two multiple of sizeof (void *). */
|
2004-03-19 07:16:54 +00:00
|
|
|
if (alignment % sizeof (void *) != 0
|
2014-12-11 16:14:17 +00:00
|
|
|
|| !powerof2 (alignment / sizeof (void *))
|
2004-03-19 07:16:54 +00:00
|
|
|
|| alignment == 0)
|
2000-04-14 17:42:46 +00:00
|
|
|
return EINVAL;
|
|
|
|
|
2013-11-20 14:46:02 +00:00
|
|
|
|
|
|
|
void *address = RETURN_ADDRESS (0);
|
|
|
|
mem = _mid_memalign (alignment, size, address);
|
2000-04-14 17:42:46 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
if (mem != NULL)
|
|
|
|
{
|
|
|
|
*memptr = mem;
|
|
|
|
return 0;
|
|
|
|
}
|
2000-04-14 17:42:46 +00:00
|
|
|
|
|
|
|
return ENOMEM;
|
|
|
|
}
|
|
|
|
weak_alias (__posix_memalign, posix_memalign)
|
|
|
|
|
2014-05-30 11:23:39 +00:00
|
|
|
|
|
|
|
int
|
2014-11-12 22:31:38 +00:00
|
|
|
__malloc_info (int options, FILE *fp)
|
2009-04-09 05:45:42 +00:00
|
|
|
{
|
2014-05-30 11:23:39 +00:00
|
|
|
/* For now, at least. */
|
|
|
|
if (options != 0)
|
|
|
|
return EINVAL;
|
2009-04-09 05:45:42 +00:00
|
|
|
|
2014-05-30 11:23:39 +00:00
|
|
|
int n = 0;
|
|
|
|
size_t total_nblocks = 0;
|
|
|
|
size_t total_nfastblocks = 0;
|
|
|
|
size_t total_avail = 0;
|
|
|
|
size_t total_fastavail = 0;
|
|
|
|
size_t total_system = 0;
|
|
|
|
size_t total_max_system = 0;
|
|
|
|
size_t total_aspace = 0;
|
|
|
|
size_t total_aspace_mprotect = 0;
|
2009-04-09 05:45:42 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
|
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
if (__malloc_initialized < 0)
|
|
|
|
ptmalloc_init ();
|
2009-04-09 05:45:42 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
fputs ("<malloc version=\"1\">\n", fp);
|
2009-04-09 05:45:42 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
/* Iterate over all arenas currently in use. */
|
|
|
|
mstate ar_ptr = &main_arena;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
fprintf (fp, "<heap nr=\"%d\">\n<sizes>\n", n++);
|
2013-11-01 14:39:26 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
size_t nblocks = 0;
|
|
|
|
size_t nfastblocks = 0;
|
|
|
|
size_t avail = 0;
|
|
|
|
size_t fastavail = 0;
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
size_t from;
|
|
|
|
size_t to;
|
|
|
|
size_t total;
|
|
|
|
size_t count;
|
|
|
|
} sizes[NFASTBINS + NBINS - 1];
|
|
|
|
#define nsizes (sizeof (sizes) / sizeof (sizes[0]))
|
2014-01-02 08:38:18 +00:00
|
|
|
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_lock (ar_ptr->mutex);
|
2009-04-09 05:45:42 +00:00
|
|
|
|
2019-08-08 20:02:27 +00:00
|
|
|
/* Account for top chunk. The top-most available chunk is
|
|
|
|
treated specially and is never in any bin. See "initial_top"
|
|
|
|
comments. */
|
|
|
|
avail = chunksize (ar_ptr->top);
|
|
|
|
nblocks = 1; /* Top always exists. */
|
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
for (size_t i = 0; i < NFASTBINS; ++i)
|
|
|
|
{
|
|
|
|
mchunkptr p = fastbin (ar_ptr, i);
|
|
|
|
if (p != NULL)
|
|
|
|
{
|
|
|
|
size_t nthissize = 0;
|
|
|
|
size_t thissize = chunksize (p);
|
|
|
|
|
|
|
|
while (p != NULL)
|
|
|
|
{
|
2020-03-31 06:00:14 +00:00
|
|
|
if (__glibc_unlikely (misaligned_chunk (p)))
|
2020-03-31 05:55:13 +00:00
|
|
|
malloc_printerr ("__malloc_info(): "
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
"unaligned fastbin chunk detected");
|
2014-05-30 11:24:56 +00:00
|
|
|
++nthissize;
|
Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
2020-03-20 19:19:17 +00:00
|
|
|
p = REVEAL_PTR (p->fd);
|
2014-05-30 11:24:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fastavail += nthissize * thissize;
|
|
|
|
nfastblocks += nthissize;
|
|
|
|
sizes[i].from = thissize - (MALLOC_ALIGNMENT - 1);
|
|
|
|
sizes[i].to = thissize;
|
|
|
|
sizes[i].count = nthissize;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
sizes[i].from = sizes[i].to = sizes[i].count = 0;
|
2009-04-09 05:45:42 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
sizes[i].total = sizes[i].count * sizes[i].to;
|
|
|
|
}
|
2009-04-09 05:45:42 +00:00
|
|
|
|
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
mbinptr bin;
|
|
|
|
struct malloc_chunk *r;
|
2009-04-09 05:45:42 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
for (size_t i = 1; i < NBINS; ++i)
|
|
|
|
{
|
|
|
|
bin = bin_at (ar_ptr, i);
|
|
|
|
r = bin->fd;
|
|
|
|
sizes[NFASTBINS - 1 + i].from = ~((size_t) 0);
|
|
|
|
sizes[NFASTBINS - 1 + i].to = sizes[NFASTBINS - 1 + i].total
|
|
|
|
= sizes[NFASTBINS - 1 + i].count = 0;
|
|
|
|
|
|
|
|
if (r != NULL)
|
|
|
|
while (r != bin)
|
|
|
|
{
|
2016-10-28 14:26:57 +00:00
|
|
|
size_t r_size = chunksize_nomask (r);
|
2014-05-30 11:24:56 +00:00
|
|
|
++sizes[NFASTBINS - 1 + i].count;
|
2016-10-28 14:26:57 +00:00
|
|
|
sizes[NFASTBINS - 1 + i].total += r_size;
|
2014-05-30 11:24:56 +00:00
|
|
|
sizes[NFASTBINS - 1 + i].from
|
2016-10-28 14:26:57 +00:00
|
|
|
= MIN (sizes[NFASTBINS - 1 + i].from, r_size);
|
2014-05-30 11:24:56 +00:00
|
|
|
sizes[NFASTBINS - 1 + i].to = MAX (sizes[NFASTBINS - 1 + i].to,
|
2016-10-28 14:26:57 +00:00
|
|
|
r_size);
|
2014-05-30 11:24:56 +00:00
|
|
|
|
|
|
|
r = r->fd;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sizes[NFASTBINS - 1 + i].count == 0)
|
|
|
|
sizes[NFASTBINS - 1 + i].from = 0;
|
|
|
|
nblocks += sizes[NFASTBINS - 1 + i].count;
|
|
|
|
avail += sizes[NFASTBINS - 1 + i].total;
|
|
|
|
}
|
2009-04-09 05:45:42 +00:00
|
|
|
|
2017-11-15 10:39:01 +00:00
|
|
|
size_t heap_size = 0;
|
|
|
|
size_t heap_mprotect_size = 0;
|
2017-11-15 10:40:41 +00:00
|
|
|
size_t heap_count = 0;
|
2017-11-15 10:39:01 +00:00
|
|
|
if (ar_ptr != &main_arena)
|
|
|
|
{
|
2017-11-15 10:40:41 +00:00
|
|
|
/* Iterate over the arena heaps from back to front. */
|
2017-11-15 10:39:01 +00:00
|
|
|
heap_info *heap = heap_for_ptr (top (ar_ptr));
|
2017-11-15 10:40:41 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
heap_size += heap->size;
|
|
|
|
heap_mprotect_size += heap->mprotect_size;
|
|
|
|
heap = heap->prev;
|
|
|
|
++heap_count;
|
|
|
|
}
|
|
|
|
while (heap != NULL);
|
2017-11-15 10:39:01 +00:00
|
|
|
}
|
|
|
|
|
2016-09-06 10:49:54 +00:00
|
|
|
__libc_lock_unlock (ar_ptr->mutex);
|
2009-04-18 05:14:52 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
total_nfastblocks += nfastblocks;
|
|
|
|
total_fastavail += fastavail;
|
2009-04-18 08:44:10 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
total_nblocks += nblocks;
|
|
|
|
total_avail += avail;
|
2009-04-18 08:44:10 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
for (size_t i = 0; i < nsizes; ++i)
|
|
|
|
if (sizes[i].count != 0 && i != NFASTBINS)
|
2019-08-01 12:06:24 +00:00
|
|
|
fprintf (fp, "\
|
2014-05-30 11:24:56 +00:00
|
|
|
<size from=\"%zu\" to=\"%zu\" total=\"%zu\" count=\"%zu\"/>\n",
|
|
|
|
sizes[i].from, sizes[i].to, sizes[i].total, sizes[i].count);
|
2014-05-26 13:54:59 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
if (sizes[NFASTBINS].count != 0)
|
|
|
|
fprintf (fp, "\
|
|
|
|
<unsorted from=\"%zu\" to=\"%zu\" total=\"%zu\" count=\"%zu\"/>\n",
|
|
|
|
sizes[NFASTBINS].from, sizes[NFASTBINS].to,
|
|
|
|
sizes[NFASTBINS].total, sizes[NFASTBINS].count);
|
2014-05-26 13:54:59 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
total_system += ar_ptr->system_mem;
|
|
|
|
total_max_system += ar_ptr->max_system_mem;
|
2009-04-09 05:45:42 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
fprintf (fp,
|
|
|
|
"</sizes>\n<total type=\"fast\" count=\"%zu\" size=\"%zu\"/>\n"
|
|
|
|
"<total type=\"rest\" count=\"%zu\" size=\"%zu\"/>\n"
|
|
|
|
"<system type=\"current\" size=\"%zu\"/>\n"
|
|
|
|
"<system type=\"max\" size=\"%zu\"/>\n",
|
|
|
|
nfastblocks, fastavail, nblocks, avail,
|
|
|
|
ar_ptr->system_mem, ar_ptr->max_system_mem);
|
2010-01-14 21:32:58 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
if (ar_ptr != &main_arena)
|
|
|
|
{
|
|
|
|
fprintf (fp,
|
|
|
|
"<aspace type=\"total\" size=\"%zu\"/>\n"
|
2017-11-15 10:40:41 +00:00
|
|
|
"<aspace type=\"mprotect\" size=\"%zu\"/>\n"
|
|
|
|
"<aspace type=\"subheaps\" size=\"%zu\"/>\n",
|
|
|
|
heap_size, heap_mprotect_size, heap_count);
|
2017-11-15 10:39:01 +00:00
|
|
|
total_aspace += heap_size;
|
|
|
|
total_aspace_mprotect += heap_mprotect_size;
|
2014-05-30 11:24:56 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fprintf (fp,
|
|
|
|
"<aspace type=\"total\" size=\"%zu\"/>\n"
|
|
|
|
"<aspace type=\"mprotect\" size=\"%zu\"/>\n",
|
|
|
|
ar_ptr->system_mem, ar_ptr->system_mem);
|
|
|
|
total_aspace += ar_ptr->system_mem;
|
|
|
|
total_aspace_mprotect += ar_ptr->system_mem;
|
|
|
|
}
|
2009-04-09 05:45:42 +00:00
|
|
|
|
2014-05-30 11:24:56 +00:00
|
|
|
fputs ("</heap>\n", fp);
|
2009-04-09 05:45:42 +00:00
|
|
|
ar_ptr = ar_ptr->next;
|
|
|
|
}
|
|
|
|
while (ar_ptr != &main_arena);
|
|
|
|
|
|
|
|
fprintf (fp,
|
2014-05-30 17:14:45 +00:00
|
|
|
"<total type=\"fast\" count=\"%zu\" size=\"%zu\"/>\n"
|
|
|
|
"<total type=\"rest\" count=\"%zu\" size=\"%zu\"/>\n"
|
2014-06-02 18:05:09 +00:00
|
|
|
"<total type=\"mmap\" count=\"%d\" size=\"%zu\"/>\n"
|
2014-05-30 17:14:45 +00:00
|
|
|
"<system type=\"current\" size=\"%zu\"/>\n"
|
|
|
|
"<system type=\"max\" size=\"%zu\"/>\n"
|
|
|
|
"<aspace type=\"total\" size=\"%zu\"/>\n"
|
|
|
|
"<aspace type=\"mprotect\" size=\"%zu\"/>\n"
|
|
|
|
"</malloc>\n",
|
|
|
|
total_nfastblocks, total_fastavail, total_nblocks, total_avail,
|
2014-05-30 17:13:52 +00:00
|
|
|
mp_.n_mmaps, mp_.mmapped_mem,
|
2014-05-30 17:14:45 +00:00
|
|
|
total_system, total_max_system,
|
|
|
|
total_aspace, total_aspace_mprotect);
|
2009-04-09 05:45:42 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2014-11-12 22:31:38 +00:00
|
|
|
weak_alias (__malloc_info, malloc_info)
|
2009-04-09 05:45:42 +00:00
|
|
|
|
|
|
|
|
2004-08-13 18:39:44 +00:00
|
|
|
strong_alias (__libc_calloc, __calloc) weak_alias (__libc_calloc, calloc)
|
|
|
|
strong_alias (__libc_free, __free) strong_alias (__libc_free, free)
|
|
|
|
strong_alias (__libc_malloc, __malloc) strong_alias (__libc_malloc, malloc)
|
|
|
|
strong_alias (__libc_memalign, __memalign)
|
|
|
|
weak_alias (__libc_memalign, memalign)
|
|
|
|
strong_alias (__libc_realloc, __realloc) strong_alias (__libc_realloc, realloc)
|
|
|
|
strong_alias (__libc_valloc, __valloc) weak_alias (__libc_valloc, valloc)
|
|
|
|
strong_alias (__libc_pvalloc, __pvalloc) weak_alias (__libc_pvalloc, pvalloc)
|
|
|
|
strong_alias (__libc_mallinfo, __mallinfo)
|
|
|
|
weak_alias (__libc_mallinfo, mallinfo)
|
2020-07-07 11:58:24 +00:00
|
|
|
strong_alias (__libc_mallinfo2, __mallinfo2)
|
|
|
|
weak_alias (__libc_mallinfo2, mallinfo2)
|
2004-08-13 18:39:44 +00:00
|
|
|
strong_alias (__libc_mallopt, __mallopt) weak_alias (__libc_mallopt, mallopt)
|
update from main archive 961220
Sat Dec 21 04:14:16 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/common/pause.c: Add missing second argument in
call to __sigpause.
Reported by a sun <asun@zoology.washington.edu>.
* locale/weight.h: Correct handling of collation elements.
Reported by Keld Simonsen <keld@dkuug.dk>.
* manual/time.texi: Document ^ flag and %P format.
* new-malloc/malloc.c: Update from Wolfram Gloger.
* nss/nss.h: Reformat copyright.
* posix/sched.h: Likewise.
* sysdeps/i386/fpu_control.h: Likewise.
* sysdeps/unix/sysv/linux/fcntlbits.h: Likewise.
* sysdeps/unix/sysv/linux/ioctls.h: Likewise.
* sysdeps/unix/sysv/linux/sigcontext.h: Likewise.
* sysdeps/unix/sysv/linux/utsnamelen.h: Likewise.
* sysdeps/unix/sysv/linux/sys/acct.h: Likewise.
* sysvips/sys/msg.h: Likewise.
* stdio-common/Makefile (routines): Remove fcloseall.
* stdio-common/fcloseall.c: Removed.
* stdlib/Makefile (distribute): Add abort-instr.h.
* sysdeps/generic/abort-instr.h: New file.
* sysdeps/i386/abort-instr.h: New file.
* sysdeps/generic/abort.c: Use lock and stage counter to prevent
any form of loop.
* sysdeps/unix/sysv/linux/timebits.h: Define CLK_TCK as 100.
* sysdeps/unix/sysv/linux/alpha/timebits.h: Define CLOCKS_PER_SEC
as 1000000. Define CLK_TCK as 1024.
* time/time.c (CLK_TCK): Define only if not already set.
* time/strftime.c: Don't use `isdigit' when computing field width
from string since the locale might have more than one digit
block.
Fri Dec 20 12:38:14 1996 Darrel Hankerson <hankedr@mail.auburn.edu>
* posix/getopt.c (in -W option handling): Return when optind == argc.
Thu Dec 19 14:24:50 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* nis/nss_nis/nis-alias.c (_nss_nis_parse_aliasent): Add const to
type of KEY.
* nis/nss_compat/compat-grp.c: Include the declaration of the file
parser.
* nis/nss_compat/compat-pwd.c: Likewise.
* nis/nss_compat/compat-spwd.c: Likewise.
* nis/nss_nis/nis-ethers.c: Likewise.
* nis/nss_nis/nis-grp.c: Likewise.
* nis/nss_nis/nis-network.c: Likewise.
* nis/nss_nis/nis-proto.c: Likewise.
* nis/nss_nis/nis-pwd.c: Likewise.
* nis/nss_nis/nis-rpc.c: Likewise.
* nis/nss_nis/nis-spwd.c: Likewise.
* nis/nss_compat/compat-grp.c (getgrent_next_nis,
getgrent_next_file): Pass the correct type for the buffer to the
parser function.
* nis/nss_compat/compat-pwd.c (getpwent_next_netgr,
getpwent_next_nis, getpwent_next_file): Likewise.
* nis/nss_compat/compat-spwd.c (getspent_next_netgr,
getspent_next_nis, getspent_next_file): Likewise.
* nis/nss_nis/nis-ethers.c (internal_nis_getetherent_r,
_nss_nis_getethernam_r, _nss_nis_getetherbyaddr_r): Likewise.
* nis/nss_nis/nis-grp.c (internal_nis_getgrent_r,
_nss_nis_getgrnam_r, _nss_nis_getgrgid_r): Likewise.
* nis/nss_nis/nis-network.c (internal_nis_getnetent_r,
_nss_nis_getnetbyname_r, _nss_nis_getnetbyaddr_r): Likewise.
* nis/nss_nis/nis-proto.c (internal_nis_getprotoent_r,
_nss_nis_getprotobyname_r, _nss_nis_getprotobynumber_r): Likewise.
* nis/nss_nis/nis-pwd.c (internal_nis_getpwent_r,
_nss_nis_getpwnam_r, _nss_nis_getpwuid_r): Likewise.
* nis/nss_nis/nis-rpc.c (internal_nis_getrpcent_r,
_nss_nis_getrpcbynumber_r): Likewise.
* nis/nss_nis/nis-spwd.c (internal_nis_getspent_r,
_nss_nis_getspnam_r): Likewise.
Thu Dec 19 13:37:16 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/setjmp.c: New file.
1996-12-21 04:13:58 +00:00
|
|
|
|
|
|
|
weak_alias (__malloc_stats, malloc_stats)
|
|
|
|
weak_alias (__malloc_usable_size, malloc_usable_size)
|
|
|
|
weak_alias (__malloc_trim, malloc_trim)
|
|
|
|
|
2017-04-18 09:50:58 +00:00
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_26)
|
|
|
|
compat_symbol (libc, __libc_free, cfree, GLIBC_2_0);
|
|
|
|
#endif
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* ------------------------------------------------------------
|
2014-01-02 08:38:18 +00:00
|
|
|
History:
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
[see ftp://g.oswego.edu/pub/misc/malloc.c for the history of dlmalloc]
|
1996-12-08 08:01:13 +00:00
|
|
|
|
2014-01-02 08:38:18 +00:00
|
|
|
*/
|
2002-01-29 07:54:51 +00:00
|
|
|
/*
|
|
|
|
* Local variables:
|
|
|
|
* c-basic-offset: 2
|
|
|
|
* End:
|
|
|
|
*/
|