summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2022-10-07 16:05:29 +0100
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2022-11-22 14:31:25 +0000
commitc38427f52d5386a25650ed982fa9a4af596a3f34 (patch)
tree9d153323274afd46d26c21197bdd264dc3f8f89c
parentde51f7328e62d59f20d7286899a99b35f746dfda (diff)
downloadglibc-c38427f52d5386a25650ed982fa9a4af596a3f34.tar.gz
cheri: malloc: disable capability narrowing on some tests
malloc/tst-malloc-backtrace tests heap corruption. malloc/tst-dynarray uses malloc_debug wrappers that access internals.
-rw-r--r--malloc/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/malloc/Makefile b/malloc/Makefile
index 4e32de2a0b..0d40188bc1 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -88,6 +88,7 @@ tests-exclude-hugetlb1 = \
tst-interpose-thread \
tst-interpose-static-nothread \
tst-interpose-static-thread \
+ tst-malloc-backtrace \
tst-malloc-usable \
tst-malloc-usable-tunables \
tst-mallocstate
@@ -159,6 +160,8 @@ libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes))
libc_malloc_debug-routines = malloc-debug $(sysdep_malloc_debug_routines)
libc_malloc_debug-inhibit-o = $(filter-out .os,$(object-suffixes))
+tst-malloc-backtrace-ENV = GLIBC_TUNABLES=glibc.mem.cap_narrowing=0
+
$(objpfx)tst-malloc-backtrace: $(shared-thread-library)
$(objpfx)tst-malloc-thread-exit: $(shared-thread-library)
$(objpfx)tst-malloc-thread-fail: $(shared-thread-library)
@@ -331,12 +334,14 @@ $(objpfx)tst-interpose-static-thread: \
$(objpfx)tst-interpose-aux-thread.o $(static-thread-library)
tst-dynarray-ENV = MALLOC_TRACE=$(objpfx)tst-dynarray.mtrace \
+ GLIBC_TUNABLES=glibc.mem.cap_narrowing=0 \
LD_PRELOAD=$(objpfx)libc_malloc_debug.so
$(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 \
+ GLIBC_TUNABLES=glibc.mem.cap_narrowing=0 \
LD_PRELOAD=$(objpfx)libc_malloc_debug.so
$(objpfx)tst-dynarray-fail-mem.out: $(objpfx)tst-dynarray-fail.out
$(common-objpfx)malloc/mtrace $(objpfx)tst-dynarray-fail.mtrace > $@; \