|
 |
218e99 |
From 5178597af3139c1ce9ac95971729468eda5625d7 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
218e99 |
Date: Mon, 27 May 2013 15:28:51 +0200
|
|
|
218e99 |
Subject: [PATCH 34/38] tests: set MALLOC_PERTURB_ to expose memory bugs
|
|
|
218e99 |
|
|
|
218e99 |
Message-id: <1379499002-5231-3-git-send-email-mreitz@redhat.com>
|
|
|
218e99 |
Patchwork-id: 54433
|
|
|
218e99 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 2/6] tests: set MALLOC_PERTURB_ to expose memory bugs
|
|
|
218e99 |
Bugzilla: 1006959
|
|
|
218e99 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
BZ: 1006959
|
|
|
218e99 |
|
|
|
218e99 |
glibc wipes malloc(3) memory when the MALLOC_PERTURB_ environment
|
|
|
218e99 |
variable is set. The value of the environment variable determines the
|
|
|
218e99 |
bit pattern used to wipe memory. For more information, see
|
|
|
218e99 |
http://udrepper.livejournal.com/11429.html.
|
|
|
218e99 |
|
|
|
218e99 |
Set MALLOC_PERTURB_ for gtester and qemu-iotests. Note we pick a random
|
|
|
218e99 |
value from 1 to 255 to expose more bugs. If you need to reproduce a
|
|
|
218e99 |
crash use 'show environment' in gdb to extract the MALLOC_PERTURB_
|
|
|
218e99 |
value from a core dump.
|
|
|
218e99 |
|
|
|
218e99 |
Both make check and qemu-iotests pass with MALLOC_PERTURB_ enabled.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
218e99 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
218e99 |
Message-id: 1369661331-28041-1-git-send-email-stefanha@redhat.com
|
|
|
218e99 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
218e99 |
(cherry picked from commit 04129606170ec9011d4952b4f22c368679bedbf9)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
tests/Makefile | 5 ++++-
|
|
|
218e99 |
tests/qemu-iotests/check | 3 ++-
|
|
|
218e99 |
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/tests/Makefile b/tests/Makefile
|
|
|
218e99 |
index a307d5a..c107489 100644
|
|
|
218e99 |
--- a/tests/Makefile
|
|
|
218e99 |
+++ b/tests/Makefile
|
|
|
218e99 |
@@ -171,6 +171,7 @@ GCOV_OPTIONS = -n $(if $(V),-f,)
|
|
|
218e99 |
$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: $(check-qtest-y)
|
|
|
218e99 |
$(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,)
|
|
|
218e99 |
$(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
|
|
|
218e99 |
+ MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$((RANDOM % 255 + 1))} \
|
|
|
218e99 |
gtester $(GTESTER_OPTIONS) -m=$(SPEED) $(check-qtest-$*-y),"GTESTER $@")
|
|
|
218e99 |
$(if $(CONFIG_GCOV),@for f in $(gcov-files-$*-y); do \
|
|
|
218e99 |
echo Gcov report for $$f:;\
|
|
|
218e99 |
@@ -180,7 +181,9 @@ $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: $(check-qtest-y)
|
|
|
218e99 |
.PHONY: $(patsubst %, check-%, $(check-unit-y))
|
|
|
218e99 |
$(patsubst %, check-%, $(check-unit-y)): check-%: %
|
|
|
218e99 |
$(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,)
|
|
|
218e99 |
- $(call quiet-command,gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER $*")
|
|
|
218e99 |
+ $(call quiet-command, \
|
|
|
218e99 |
+ MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$((RANDOM % 255 + 1))} \
|
|
|
218e99 |
+ gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER $*")
|
|
|
218e99 |
$(if $(CONFIG_GCOV),@for f in $(gcov-files-$(subst tests/,,$*)-y); do \
|
|
|
218e99 |
echo Gcov report for $$f:;\
|
|
|
218e99 |
$(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \
|
|
|
218e99 |
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
|
|
|
218e99 |
index 432732c..74628ae 100755
|
|
|
218e99 |
--- a/tests/qemu-iotests/check
|
|
|
218e99 |
+++ b/tests/qemu-iotests/check
|
|
|
218e99 |
@@ -214,7 +214,8 @@ do
|
|
|
218e99 |
start=`_wallclock`
|
|
|
218e99 |
$timestamp && echo -n " ["`date "+%T"`"]"
|
|
|
218e99 |
[ ! -x $seq ] && chmod u+x $seq # ensure we can run it
|
|
|
218e99 |
- ./$seq >$tmp.out 2>&1
|
|
|
218e99 |
+ MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \
|
|
|
218e99 |
+ ./$seq >$tmp.out 2>&1
|
|
|
218e99 |
sts=$?
|
|
|
218e99 |
$timestamp && _timestamp
|
|
|
218e99 |
stop=`_wallclock`
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|