@@ -1,3 +1,8 @@

+Sun Sep 14 17:20:14 EEST 2008 (edwin)

+-------------------------------------

+  * clamd/thrmgr.c: fix valgrind warning (bb #1184)

+  * unit_tests: add more valgrind tests, add a reload and a multiscan test (bb #1092)

+

 Thu Sep 11 21:46:48 CEST 2008 (tk)

 ----------------------------------

   * libclamav/pdf.c: fix write error with specific files (bb#1181)

@@ -101,13 +101,20 @@ static void *work_queue_pop(work_queue_t *work_q)

 void thrmgr_destroy(threadpool_t *threadpool)

 {

-	if (!threadpool || (threadpool->state != POOL_VALID)) {

+	if (!threadpool) {

 		return;

 	}

   	if (pthread_mutex_lock(&threadpool->pool_mutex) != 0) {

    		logg("!Mutex lock failed\n");

     		exit(-1);

 	}

+	if(threadpool->state != POOL_VALID) {

+		if (pthread_mutex_unlock(&threadpool->pool_mutex) != 0) {

+			logg("!Mutex unlock failed\n");

+			exit(-1);

+		}

+		return;

+	}

 	threadpool->state = POOL_EXIT;

 	/* wait for threads to exit */

@@ -26,7 +26,7 @@ check_clamscan.sh: $(top_builddir)/test/clam.exe

 $(top_builddir)/test/clam.exe:

 	(cd $(top_builddir)/test && $(MAKE))

-CLEANFILES=lcov.out *.gcno *.gcda *.log clamd-test.socket /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind.log clamdscan.log

+CLEANFILES=lcov.out *.gcno *.gcda *.log clamd-test.socket /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind-*.log clamdscan.log clamdscan-multiscan.log

 EXTRA_DIST=.split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts)

 if ENABLE_COVERAGE

 LCOV_OUTPUT = lcov.out

@@ -1,18 +1,15 @@

-#!/bin/sh 

-#set -x

+#!/bin/sh  

+CLAMD_WRAPPER=${CLAMD_WRAPPER-}

 killclamd() {

 	test -f /tmp/clamd-test.pid || return

 	pid=`cat /tmp/clamd-test.pid`

 	kill -0 $pid && kill $pid

-	pippo=0

-	while test -f /tmp/clamd-test.pid; do

-		sleep 1

-		pippo=`expr $pippo + 1`

-		if test $pippo -gt 9; then

-			kill -KILL $pid

-			rm /tmp/clamd-test.pid

-		fi

-	done

+	timeout=10

+	(sleep $timeout; kill -KILL $pid) &

+	sleeperpid=$!

+	wait $pid

+	kill -ALRM $sleeperpid 2>/dev/null

+	rm -f /tmp/clamd-test.pid

 }

 die() {

 	killclamd

@@ -22,10 +19,14 @@ die() {

 run_clamd_test() {

 	conf_file=$1

 	shift

-	rm -f clamdscan.log

-	../clamd/clamd -c $conf_file || { echo "Failed to start clamd!" >&2; die 1;}

+	rm -f clamdscan.log clamdscan-multiscan.log

+	../libtool --mode=execute $CLAMD_WRAPPER ../clamd/clamd -c $conf_file || { echo "Failed to start clamd!" >&2; die 1;}

 	../clamdscan/clamdscan --version --config-file $conf_file 2>&1|grep "^ClamAV" >/dev/null || { echo "clamdscan can't get version of clamd!" >&2; die 2;}

 	../clamdscan/clamdscan --quiet --config-file $conf_file $* --log=clamdscan.log

+	../clamdscan/clamdscan --quiet --config-file $conf_file $* -m --log=clamdscan-multiscan.log

+	if test -x /bin/nc; then

+		echo RELOAD | nc -q 0 -n 127.0.0.1 3311

+	fi

 	if test $? = 2; then 

 		echo "Failed to run clamdscan!" >&2;

 		die 3;	

@@ -37,7 +38,7 @@ run_clamd_fdpass_test() {

 	conf_file=$1

 	shift

 	rm -f clamdscan.log

-	../clamd/clamd -c $conf_file || { echo "Failed to start clamd!" >&2; die 1;}

+	../libtool --mode=execute $CLAMD_WRAPPER ../clamd/clamd -c $conf_file || { echo "Failed to start clamd!" >&2; die 1;}

 	../clamdscan/clamdscan --quiet --fdpass --config-file $conf_file - <$1 --log=clamdscan.log

 	if test $? = 2; then

 		echo "Failed to run clamdscan!" >&2;

@@ -58,11 +59,17 @@ FILES=../test/clam*

 run_clamd_test $srcdir/test-clamd.conf $FILES

 NFILES=`ls -1 $FILES | wc -l`

 NINFECTED=`grep "Infected files" clamdscan.log | cut -f2 -d:|sed -e 's/ //g'`

+NINFECTED_MULTI=`grep "Infected files" clamdscan-multiscan.log | cut -f2 -d:|sed -e 's/ //g'`

 if test "$NFILES" -ne "0$NINFECTED"; then

 	echo "clamd did not detect all testfiles correctly!" >&2;

 	grep OK clamdscan.log >&2;

 	die 4;

 fi

+if test "$NFILES" -ne "0$NINFECTED_MULTI"; then

+	echo "clamd did not detect all testfiles correctly in multiscan mode!" >&2;

+	grep OK clamdscan-multiscan.log >&2;

+	die 4;

+fi

 # Test VirusEvent feature

 cat <$srcdir/test-clamd.conf >test-clamd-viraction.conf

@@ -6,6 +6,8 @@ PidFile /tmp/clamd-test.pid

 DatabaseDirectory test-db

 LocalSocket clamd-test.socket

 TCPAddr 127.0.0.1

+# using different port here to avoid conflicts with system clamd daemon

+TCPSocket 3311

 ExitOnOOM yes

 DetectPUA yes

 ScanPDF yes

@@ -12,3 +12,114 @@

 	obj:/lib*/libc-*.so

 	fun:__libc_freeres

 }

+{

+	helgrind-glibc27-dbg01

+	Helgrind:Race

+	fun:mythread_wrapper

+	fun:start_thread

+}

+{

+	helgrind-glibc27-dbg02

+	Helgrind:Race

+	fun:pthread_mutex_*

+}

+{

+	helgrind-glibc27-dbg03

+	Helgrind:Race

+	fun:pthread_create*

+}

+{

+	helgrind-glibc27-dbg04

+	Helgrind:Race

+	fun:pthread_create*

+}

+{

+	helgrind-glibc27-dbg05

+	Helgrind:Race

+	fun:__deallocate_stack

+	fun:start_thread

+}

+{

+	helgrind-glibc27-dbg05

+	Helgrind:Race

+	fun:free_stacks

+	fun:__deallocate_stack

+	fun:start_thread

+}

+{

+	helgrind-glibc27-dbg06

+	Helgrind:Race

+	fun:*

+	obj:/usr/lib/debug/libpthread-*.so

+}

+{

+	helgrind-glibc27-dbg06

+	Helgrind:Race

+	fun:*

+	obj:/lib/libpthread-*.so

+}

+{

+	helgrind-glibc27-dbg08

+	Helgrind:Race

+	obj:/lib/ld-*.so

+}

+{

+	helgrind-glibc27-dbg09

+	Helgrind:Race

+	fun:*

+	fun:exit

+}

+{

+	helgrind-glibc27-dbg10

+	Helgrind:Race

+	fun:*

+	fun:*

+	fun:exit

+}

+{

+	helgrind-glibc27-dbg11

+	Helgrind:Race

+	fun:*

+	fun:*

+	fun:*

+	fun:exit

+}

+{

+	helgrind-glibc27-dbg12

+	Helgrind:Race

+	fun:*

+	fun:*

+	fun:*

+	fun:*

+	fun:exit

+}

+{

+	helgrind-glibc27-dbg13

+	Helgrind:Race

+	fun:*

+	fun:*

+	fun:ctime_r

+}

+{

+	helgrind-glibc27-dbg14

+	Helgrind:Race

+	fun:_IO_link_in

+	fun:_IO_file_init*

+}

+# libc has a gconv_lock, but valgrind doesn't know that because it uses lll_lock

+# instead of pthread_mutex_lock

+{

+	helgrind-glibc27-dbg15

+	Helgrind:Race

+	fun:__gconv_release_shlib

+}

+{

+	helgrind-glibc27-dbg16

+	Helgrind:Race

+	fun:__gconv_find_shlib

+}

+{

+	helgrind-glibc27-dbg17

+	Helgrind:Race

+	fun:exit

+}

@@ -1,28 +1,79 @@

 #!/bin/sh

+# 

+# We don't look for 'still reachable' blocks, since clamd fork()s after loading

+# the DB. The parent exits without freeing the memory (but they are freed

+# anyway due to the exit).

+# To test for DB load leaks, we issue a RELOAD command, which should cause

+# leaks to be reported by valgrind if there are any.

+# 

+

 VALGRIND=`which ${VALGRIND-valgrind}`

-VALGRIND_FLAGS="--trace-children=yes --track-fds=yes --leak-check=full --show-reachable=yes --suppressions=$srcdir/valgrind.supp"

 test -n "$VALGRIND" || { echo "*** valgrind not found, skipping test"; exit 77; }

 test -x "$VALGRIND" || { echo "*** valgrind not executable, skipping test"; exit 77; }

-echo "Running valgrind"

-CK_FORK=no ../libtool --mode=execute $VALGRIND $VALGRIND_FLAGS ./check_clamav 2>&1 | cat >valgrind.log

-if grep "ERROR SUMMARY: 0 errors" valgrind.log >/dev/null; then

-	if grep "no leaks are possible" valgrind.log >/dev/null; then

-		echo "Valgrind tests successful"

-		exit 0;

+parse_valgrindlog()

+{

+	if test ! -f $1; then

+		echo "Logfile $1 not found. Valgrind failed to run?"

+		exit 2;

+	fi

+	NRUNS=`grep "ERROR SUMMARY" $1 | wc -l`

+	if test $NRUNS -eq `grep "ERROR SUMMARY: 0 errors" $1 | wc -l`; then

+		if test "$1" = "valgrind-race.log" || 

+			test $NRUNS -eq `grep "no leaks are possible" $1 | wc -l` ||

+			test `grep "lost:" $1 | grep -v "0 bytes" | wc -l` -ne 0; then 

+			rm -f $1;

+			return

+		else

+			echo "*** Valgrind test FAILED, memory LEAKS detected ***"

+			grep "lost:" $1 | grep -v "0 bytes"

+		fi

+	else

+		if test "$1" = "valgrind-race.log" ; then

+			echo "*** Valgrind test FAILED, DATA RACES detected ****"

+		else

+			echo "*** Valgrind test FAILED, memory ERRORS detected ****"

+		fi

+		grep "ERROR SUMMARY" $1 | grep -v "0 errors"

+		sed -rn '

+			/^[=0-9]+ +at/ {

+				# save current line in hold buffer

+				x

+				# print hold buffer

+				p

+				# get original line back

+				x

+			}

+			# store it in hold buffer

+			h

+			/^[=0-9]+ FILE DESC/ {

+				q

+			}

+		' <$1 | grep -v "Thread.+was created"

 	fi

-	echo "*** Valgrind test FAILED, memory LEAKS detected ***"

-else

-	echo "*** Valgrind test FAILED, memory ERRORS detected ****"

+	echo "***"

+	echo "*** Please submit $1 to http://bugs.clamav.net"

+	echo "***"

+}

+

+

+VALGRIND_FLAGS="-v --trace-children=yes --track-fds=yes --leak-check=full --suppressions=$srcdir/valgrind.supp"

+VALGRIND_FLAGS_RACE="-v --tool=helgrind --trace-children=yes --suppressions=$srcdir/valgrind.supp"

+

+echo "--- Running valgrind/memcheck"

+rm -f valgrind-check.log valgrind-clamd.log valgrind-race.log

+CK_FORK=no ../libtool --mode=execute $VALGRIND $VALGRIND_FLAGS ./check_clamav >valgrind-check.log 2>&1

+parse_valgrindlog valgrind-check.log

+

+echo "--- Running clamd under valgrind/memcheck"

+CLAMD_WRAPPER="$VALGRIND $VALGRIND_FLAGS" $srcdir/check_clamd.sh >valgrind-clamd.log 2>&1

+parse_valgrindlog valgrind-clamd.log

+

+echo "--- Running clamd under valgrind/helgrind"

+CLAMD_WRAPPER="$VALGRIND $VALGRIND_FLAGS_RACE" $srcdir/check_clamd.sh >valgrind-race.log 2>&1

+parse_valgrindlog valgrind-race.log

+

+if test -f valgrind-check.log -o -f valgrind-race.log -o -f valgrind-clamd.log; then

+	exit 1;

 fi

-echo 

-grep "ERROR SUMMARY" valgrind.log

-echo `grep "Invalid read" valgrind.log| wc -l` "invalid reads"

-echo `grep "Invalid write" valgrind.log| wc -l` "invalid writes"

-echo `grep "Invalid free" valgrind.log| wc -l` "invalid frees"

-echo `grep "uninitialised value" valgrind.log|wc -l` "uses of uninitialized values"

-grep " lost:" valgrind.log

-grep "still reachable:" valgrind.log

-grep "FILE DESCRIPTORS" valgrind.log

-echo 

-exit 1;

+exit 0