Fix ASAN usage

Previously if ASAN libraries were detected, it would enable the use
of ASAN in the auparse unit tests. This means it can be enabled by accident
when people didn't want it at all.

Now require --with-asan to enable ASAN for unit tests only. And support
ASAN in all unit tests.

Author: stevegrubb

audisp/plugins/remote/Makefile.am

@@ -34,6 +34,10 @@ noinst_HEADERS = remote-config.h queue.h
 man_MANS = audisp-remote.8 audisp-remote.conf.5
 check_PROGRAMS = test-queue
 TESTS = $(check_PROGRAMS)
+if HAVE_ASAN
+test_queue_CFLAGS = ${ASAN_FLAGS}
+test_queue_LDFLAGS = ${ASAN_FLAGS}
+endif
 
 audisp_remote_DEPENDENCIES = ${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la ${top_builddir}/auplugin/libauplugin.la
 audisp_remote_SOURCES = audisp-remote.c remote-config.c queue.c

audisp/test/Makefile.am

@@ -23,6 +23,11 @@
 AM_CPPFLAGS = -D_GNU_SOURCE -I${top_srcdir} -I${top_srcdir}/audisp \
 	-I${top_srcdir}/common -I${top_srcdir}/src -I${top_srcdir}/lib
 AM_CFLAGS = -D_GNU_SOURCE -Wno-pointer-sign ${WFLAGS}
+AM_LDFLAGS =
+if HAVE_ASAN
+AM_CFLAGS += ${ASAN_FLAGS}
+AM_LDFLAGS += ${ASAN_FLAGS}
+endif
 check_PROGRAMS = audisp-queue-test audisp-llist-test
 TESTS = $(check_PROGRAMS)
 

auplugin/test/Makefile.am

@@ -22,6 +22,11 @@
 
 AM_CPPFLAGS = -I${top_srcdir}/auplugin -I${top_srcdir}/lib -I${top_srcdir}/auparse
 AM_CFLAGS = -D_GNU_SOURCE -Wno-pointer-sign ${WFLAGS}
+AM_LDFLAGS =
+if HAVE_ASAN
+AM_CFLAGS += ${ASAN_FLAGS}
+AM_LDFLAGS += ${ASAN_FLAGS}
+endif
 check_PROGRAMS = fgets_test metrics_test fgets_r_test
 TESTS = $(check_PROGRAMS)
 

configure.ac

@@ -301,16 +301,30 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[WFLAGS="${WFLAGS} -Wno-unused-but-
 CFLAGS="${TMPCFLAGS}"
 AC_SUBST(WFLAGS)
 
-AC_MSG_CHECKING([for -fsanitize=address])
-TMPCFLAGS="${CFLAGS}"
-TMPLDFLAGS="${LDFLAGS}"
-CFLAGS="${CFLAGS} -fsanitize=address"
-LDFLAGS="${LDFLAGS} -fsanitize=address"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-[ASAN_FLAGS="-fsanitize=address"; have_asan=yes; AC_MSG_RESULT(yes)],
-[have_asan=no; AC_MSG_RESULT(no)])
-CFLAGS="${TMPCFLAGS}"
-LDFLAGS="${TMPLDFLAGS}"
+AC_ARG_WITH([asan],
+        [AS_HELP_STRING([--with-asan],
+                        [build unit tests with AddressSanitizer instrumentation])],
+        [case "${withval}" in
+         yes) want_asan="yes" ;;
+          no) want_asan="no" ;;
+           *) AC_MSG_ERROR(bad value ${withval} for --with-asan) ;;
+         esac],
+        [want_asan="no"])
+
+have_asan=no
+ASAN_FLAGS=""
+if test x$want_asan = xyes; then
+        AC_MSG_CHECKING([for -fsanitize=address support])
+        TMPCFLAGS="${CFLAGS}"
+        TMPLDFLAGS="${LDFLAGS}"
+        CFLAGS="${CFLAGS} -fsanitize=address"
+        LDFLAGS="${LDFLAGS} -fsanitize=address"
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+                [ASAN_FLAGS="-fsanitize=address"; have_asan=yes; AC_MSG_RESULT(yes)],
+                [AC_MSG_FAILURE([--with-asan was given, but -fsanitize=address is not supported by the compiler or linker])])
+        CFLAGS="${TMPCFLAGS}"
+        LDFLAGS="${TMPLDFLAGS}"
+fi
 AC_SUBST(ASAN_FLAGS)
 AM_CONDITIONAL(HAVE_ASAN, test x$have_asan = xyes)
 AM_CONDITIONAL(BUILD_STATIC, test "x$enable_static" != "xno")

lib/test/Makefile.am

@@ -21,6 +21,11 @@
 
 AM_CPPFLAGS = -I${top_srcdir}/lib
 AM_CFLAGS = -D_GNU_SOURCE -Wno-pointer-sign ${WFLAGS}
+AM_LDFLAGS =
+if HAVE_ASAN
+AM_CFLAGS += ${ASAN_FLAGS}
+AM_LDFLAGS += ${ASAN_FLAGS}
+endif
 check_PROGRAMS = lookup_test
 TESTS = $(check_PROGRAMS)
 

src/test/Makefile.am

@@ -21,6 +21,11 @@
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/src
 AM_CFLAGS = -D_GNU_SOURCE -Wno-pointer-sign ${WFLAGS}
+AM_LDFLAGS =
+if HAVE_ASAN
+AM_CFLAGS += ${ASAN_FLAGS}
+AM_LDFLAGS += ${ASAN_FLAGS}
+endif
 check_PROGRAMS = ilist_test slist_test format_event_test
 TESTS = $(check_PROGRAMS)
 ilist_test_LDADD = ${top_builddir}/src/ausearch-int.o

tools/aulast/test/Makefile.am

@@ -5,4 +5,9 @@ TESTS = aulast_llist_test
 AM_CPPFLAGS = -I${top_srcdir}/tools/aulast
 
 aulast_llist_test_SOURCES = aulast_llist_test.c ${top_srcdir}/tools/aulast/aulast-llist.c
+if HAVE_ASAN
+aulast_llist_test_CFLAGS = ${ASAN_FLAGS}
+aulast_llist_test_LDFLAGS = ${ASAN_FLAGS}
+else
 aulast_llist_test_LDFLAGS = -static
+endif