mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
8e448310d7
When posix_memalign is called with an alignment less than MALLOC_ALIGNMENT and a requested size close to SIZE_MAX, it falls back to malloc code (because the alignment of a block returned by malloc is sufficient to satisfy the call). In this case, an integer overflow in _int_malloc leads to posix_memalign incorrectly returning successfully. Upon fixing this and writing a somewhat thorough regression test, it was discovered that when posix_memalign is called with an alignment larger than MALLOC_ALIGNMENT (so it uses _int_memalign instead) and a requested size close to SIZE_MAX, a different integer overflow in _int_memalign leads to posix_memalign incorrectly returning successfully. Both integer overflows affect other memory allocation functions that use _int_malloc (one affected malloc in x86) or _int_memalign as well. This commit fixes both integer overflows. In addition to this, it adds a regression test to guard against false successful allocations by the following memory allocation functions when called with too-large allocation sizes and, where relevant, various valid alignments: malloc, realloc, calloc, reallocarray, memalign, posix_memalign, aligned_alloc, valloc, and pvalloc.
252 lines
7.8 KiB
Makefile
252 lines
7.8 KiB
Makefile
# Copyright (C) 1991-2018 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Makefile for malloc routines
|
|
#
|
|
subdir := malloc
|
|
|
|
include ../Makeconfig
|
|
|
|
dist-headers := malloc.h
|
|
headers := $(dist-headers) obstack.h mcheck.h
|
|
tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
|
|
tst-mcheck tst-mallocfork tst-trim1 \
|
|
tst-malloc-usable tst-realloc tst-reallocarray tst-posix_memalign \
|
|
tst-pvalloc tst-memalign tst-mallopt \
|
|
tst-malloc-backtrace tst-malloc-thread-exit \
|
|
tst-malloc-thread-fail tst-malloc-fork-deadlock \
|
|
tst-mallocfork2 \
|
|
tst-interpose-nothread \
|
|
tst-interpose-thread \
|
|
tst-alloc_buffer \
|
|
tst-malloc-tcache-leak \
|
|
tst-malloc_info \
|
|
tst-malloc-too-large \
|
|
|
|
tests-static := \
|
|
tst-interpose-static-nothread \
|
|
tst-interpose-static-thread \
|
|
tst-malloc-usable-static \
|
|
|
|
tests-internal := tst-mallocstate tst-scratch_buffer
|
|
|
|
# The dynarray framework is only available inside glibc.
|
|
tests-internal += \
|
|
tst-dynarray \
|
|
tst-dynarray-fail \
|
|
tst-dynarray-at-fail \
|
|
|
|
ifneq (no,$(have-tunables))
|
|
tests += tst-malloc-usable-tunables
|
|
tests-static += tst-malloc-usable-static-tunables
|
|
endif
|
|
|
|
tests += $(tests-static)
|
|
test-srcs = tst-mtrace
|
|
|
|
routines = malloc morecore mcheck mtrace obstack reallocarray \
|
|
scratch_buffer_grow scratch_buffer_grow_preserve \
|
|
scratch_buffer_set_array_size \
|
|
dynarray_at_failure \
|
|
dynarray_emplace_enlarge \
|
|
dynarray_finalize \
|
|
dynarray_resize \
|
|
dynarray_resize_clear \
|
|
alloc_buffer_alloc_array \
|
|
alloc_buffer_allocate \
|
|
alloc_buffer_copy_bytes \
|
|
alloc_buffer_copy_string \
|
|
alloc_buffer_create_failure \
|
|
|
|
install-lib := libmcheck.a
|
|
non-lib.a := libmcheck.a
|
|
|
|
# Additional library.
|
|
extra-libs = libmemusage
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
# Helper objects for some tests.
|
|
extra-tests-objs += \
|
|
tst-interpose-aux-nothread.o \
|
|
tst-interpose-aux-thread.o \
|
|
|
|
test-extras = \
|
|
tst-interpose-aux-nothread \
|
|
tst-interpose-aux-thread \
|
|
|
|
libmemusage-routines = memusage
|
|
libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
|
|
$(objpfx)tst-malloc-backtrace: $(shared-thread-library)
|
|
$(objpfx)tst-malloc-thread-exit: $(shared-thread-library)
|
|
$(objpfx)tst-malloc-thread-fail: $(shared-thread-library)
|
|
$(objpfx)tst-malloc-fork-deadlock: $(shared-thread-library)
|
|
|
|
# Export the __malloc_initialize_hook variable to libc.so.
|
|
LDFLAGS-tst-mallocstate = -rdynamic
|
|
|
|
# These should be removed by `make clean'.
|
|
extra-objs = mcheck-init.o libmcheck.a
|
|
others-extras = mcheck-init.o
|
|
|
|
# Include the cleanup handler.
|
|
aux := set-freeres thread-freeres
|
|
|
|
# The Perl script to analyze the output of the mtrace functions.
|
|
ifneq ($(PERL),no)
|
|
install-bin-script = mtrace
|
|
generated += mtrace
|
|
|
|
# The Perl script will print addresses and to do this nicely we must know
|
|
# whether we are on a 32 or 64 bit machine.
|
|
ifneq ($(findstring wordsize-32,$(config-sysdirs)),)
|
|
address-width=10
|
|
else
|
|
address-width=18
|
|
endif
|
|
endif
|
|
|
|
# Unless we get a test for the availability of libgd which also works
|
|
# for cross-compiling we disable the memusagestat generation in this
|
|
# situation.
|
|
ifneq ($(cross-compiling),yes)
|
|
# If the gd library is available we build the `memusagestat' program.
|
|
ifneq ($(LIBGD),no)
|
|
others: $(objpfx)memusage
|
|
install-bin = memusagestat
|
|
install-bin-script += memusage
|
|
generated += memusagestat memusage
|
|
extra-objs += memusagestat.o
|
|
|
|
# The configure.ac check for libgd and its headers did not use $SYSINCLUDES.
|
|
# The directory specified by --with-headers usually contains only the basic
|
|
# kernel interface headers, not something like libgd. So the simplest thing
|
|
# is to presume that the standard system headers will be ok for this file.
|
|
$(objpfx)memusagestat.o: sysincludes = # nothing
|
|
endif
|
|
endif
|
|
|
|
# Another goal which can be used to override the configure decision.
|
|
.PHONY: do-memusagestat
|
|
do-memusagestat: $(objpfx)memusagestat
|
|
|
|
memusagestat-modules = memusagestat
|
|
|
|
cpp-srcs-left := $(memusagestat-modules)
|
|
lib := memusagestat
|
|
include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
|
|
|
|
$(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o)
|
|
$(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz -lm
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
ifeq (yes,$(build-shared))
|
|
ifneq ($(PERL),no)
|
|
tests-special += $(objpfx)tst-mtrace.out
|
|
tests-special += $(objpfx)tst-dynarray-mem.out
|
|
tests-special += $(objpfx)tst-dynarray-fail-mem.out
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
include ../Rules
|
|
|
|
CFLAGS-mcheck-init.c += $(PIC-ccflag)
|
|
CFLAGS-obstack.c += $(uses-callbacks)
|
|
|
|
$(objpfx)libmcheck.a: $(objpfx)mcheck-init.o
|
|
-rm -f $@
|
|
$(patsubst %/,cd % &&,$(objpfx)) \
|
|
$(LN_S) $(<F) $(@F)
|
|
|
|
lib: $(objpfx)libmcheck.a
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
ifeq (yes,$(build-shared))
|
|
ifneq ($(PERL),no)
|
|
$(objpfx)tst-mtrace.out: tst-mtrace.sh $(objpfx)tst-mtrace
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-prefix-before-env)' \
|
|
'$(run-program-env)' '$(test-program-prefix-after-env)' > $@; \
|
|
$(evaluate-test)
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
tst-mcheck-ENV = MALLOC_CHECK_=3
|
|
tst-malloc-usable-ENV = MALLOC_CHECK_=3
|
|
tst-malloc-usable-static-ENV = $(tst-malloc-usable-ENV)
|
|
tst-malloc-usable-tunables-ENV = GLIBC_TUNABLES=glibc.malloc.check=3
|
|
tst-malloc-usable-static-tunables-ENV = $(tst-malloc-usable-tunables-ENV)
|
|
|
|
ifeq ($(experimental-malloc),yes)
|
|
CPPFLAGS-malloc.c += -DUSE_TCACHE=1
|
|
else
|
|
CPPFLAGS-malloc.c += -DUSE_TCACHE=0
|
|
endif
|
|
# Uncomment this for test releases. For public releases it is too expensive.
|
|
#CPPFLAGS-malloc.o += -DMALLOC_DEBUG=1
|
|
|
|
sLIBdir := $(shell echo $(slibdir) | sed 's,lib\(\|64\)$$,\\\\$$LIB,')
|
|
|
|
$(objpfx)mtrace: mtrace.pl
|
|
rm -f $@.new
|
|
sed -e 's|@PERL@|$(PERL)|' -e 's|@XXX@|$(address-width)|' \
|
|
-e 's|@VERSION@|$(version)|' \
|
|
-e 's|@PKGVERSION@|$(PKGVERSION)|' \
|
|
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \
|
|
&& rm -f $@ && mv $@.new $@ && chmod +x $@
|
|
|
|
$(objpfx)memusage: memusage.sh
|
|
rm -f $@.new
|
|
sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \
|
|
-e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \
|
|
-e 's|@PKGVERSION@|$(PKGVERSION)|' \
|
|
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \
|
|
&& rm -f $@ && mv $@.new $@ && chmod +x $@
|
|
|
|
|
|
# The implementation uses `dlsym'
|
|
$(objpfx)libmemusage.so: $(libdl)
|
|
|
|
# Extra dependencies
|
|
$(foreach o,$(all-object-suffixes),$(objpfx)malloc$(o)): arena.c hooks.c
|
|
|
|
# Compile the tests with a flag which suppresses the mallopt call in
|
|
# the test skeleton.
|
|
$(tests:%=$(objpfx)%.o): CPPFLAGS += -DTEST_NO_MALLOPT
|
|
|
|
$(objpfx)tst-interpose-nothread: $(objpfx)tst-interpose-aux-nothread.o
|
|
$(objpfx)tst-interpose-thread: \
|
|
$(objpfx)tst-interpose-aux-thread.o $(shared-thread-library)
|
|
$(objpfx)tst-interpose-static-nothread: $(objpfx)tst-interpose-aux-nothread.o
|
|
$(objpfx)tst-interpose-static-thread: \
|
|
$(objpfx)tst-interpose-aux-thread.o $(static-thread-library)
|
|
|
|
tst-dynarray-ENV = MALLOC_TRACE=$(objpfx)tst-dynarray.mtrace
|
|
$(objpfx)tst-dynarray-mem.out: $(objpfx)tst-dynarray.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-dynarray.mtrace > $@; \
|
|
$(evaluate-test)
|
|
|
|
tst-dynarray-fail-ENV = MALLOC_TRACE=$(objpfx)tst-dynarray-fail.mtrace
|
|
$(objpfx)tst-dynarray-fail-mem.out: $(objpfx)tst-dynarray-fail.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-dynarray-fail.mtrace > $@; \
|
|
$(evaluate-test)
|
|
|
|
$(objpfx)tst-malloc-tcache-leak: $(shared-thread-library)
|
|
$(objpfx)tst-malloc_info: $(shared-thread-library)
|