[master] 75ceb18 build: support for asan/tsan/msan/ubsan sanitizers
Guillaume Quintard
guillaume at varnish-software.com
Wed Feb 17 18:42:49 CET 2016
commit 75ceb1893529080014bf45d54562f9f5f249f636
Author: Devon H. O'Dell <devon.odell at gmail.com>
Date: Thu Feb 4 23:39:26 2016 +0000
build: support for asan/tsan/msan/ubsan sanitizers
Modern versions of gcc and clang support various runtime sanitizers that
can be used to find nasty bugs at runtime. Note that not all of these
sanitizers may be active at the same time. However, these tools are aimed
at developers and likely require at least some level of reference during
testing while enabled -- which discouraged me from doing a matrix of
conditionals in autohell.
diff --git a/bin/varnishadm/Makefile.am b/bin/varnishadm/Makefile.am
index 9033e08..f0bd8ad 100644
--- a/bin/varnishadm/Makefile.am
+++ b/bin/varnishadm/Makefile.am
@@ -13,9 +13,17 @@ varnishadm_SOURCES = \
$(top_srcdir)/lib/libvarnish/vtcp.c \
$(top_srcdir)/lib/libvarnish/vss.c
-varnishadm_CFLAGS = @LIBEDIT_CFLAGS@
+varnishadm_CFLAGS = @LIBEDIT_CFLAGS@ \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
varnishadm_LDADD = \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
- ${PTHREAD_LIBS} ${RT_LIBS} ${NET_LIBS} @LIBEDIT_LIBS@ ${LIBM}
+ ${PTHREAD_LIBS} ${RT_LIBS} ${NET_LIBS} @LIBEDIT_LIBS@ ${LIBM} \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 0eb9251..2fb09b8 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -133,8 +133,12 @@ nobase_pkginclude_HEADERS = \
varnishd_CFLAGS = \
@PCRE_CFLAGS@ \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@ \
-DVARNISHD_IS_NOT_A_VMOD \
- -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
+ -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
-DVARNISH_VMOD_DIR='"${pkglibdir}/vmods"' \
-DVARNISH_VCL_DIR='"${varnishconfdir}"'
@@ -145,6 +149,10 @@ varnishd_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvcc/libvcc.la \
$(top_builddir)/lib/libvgz/libvgz.la \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@ \
@JEMALLOC_LDADD@ \
@PCRE_LIBS@ \
${DL_LIBS} ${PTHREAD_LIBS} ${NET_LIBS} ${LIBM} ${LIBUMEM}
diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index 5904430..b1e8e7b 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -16,10 +16,20 @@ varnishhist_SOURCES = varnishhist.c \
$(top_srcdir)/lib/libvarnish/flopen.c \
$(top_srcdir)/lib/libvarnishtools/vut.c
+varnishhist_CFLAGS = \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+
varnishhist_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
-lm \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@ \
@CURSES_LIB@ ${RT_LIBS} ${PTHREAD_LIBS}
noinst_PROGRAMS = varnishhist_opt2rst
diff --git a/bin/varnishlog/Makefile.am b/bin/varnishlog/Makefile.am
index 2df9415..1416889 100644
--- a/bin/varnishlog/Makefile.am
+++ b/bin/varnishlog/Makefile.am
@@ -18,9 +18,19 @@ varnishlog_SOURCES = \
$(top_srcdir)/lib/libvarnish/vpf.c \
$(top_srcdir)/lib/libvarnish/vtim.c
+varnishlog_CFLAGS = \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+
varnishlog_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@ \
${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
noinst_PROGRAMS = varnishlog_opt2rst
diff --git a/bin/varnishncsa/Makefile.am b/bin/varnishncsa/Makefile.am
index d63df61..b5d1bff 100644
--- a/bin/varnishncsa/Makefile.am
+++ b/bin/varnishncsa/Makefile.am
@@ -20,9 +20,19 @@ varnishncsa_SOURCES = \
$(top_srcdir)/lib/libvarnish/vtim.c \
$(top_srcdir)/lib/libvarnish/vsb.c
+varnishncsa_CFLAGS = \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+
varnishncsa_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@ \
${RT_LIBS} ${LIBM}
noinst_PROGRAMS = varnishncsa_opt2rst
diff --git a/bin/varnishstat/Makefile.am b/bin/varnishstat/Makefile.am
index a276444..50f8ad0 100644
--- a/bin/varnishstat/Makefile.am
+++ b/bin/varnishstat/Makefile.am
@@ -15,9 +15,19 @@ varnishstat_SOURCES = \
$(top_srcdir)/lib/libvarnish/version.c \
$(top_srcdir)/lib/libvarnish/vtim.c
+varnishstat_CFLAGS = \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+
varnishstat_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@ \
@CURSES_LIB@ ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
noinst_PROGRAMS = vsc2rst
diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index 2506a8a..c333968 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -42,9 +42,17 @@ varnishtest_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
$(top_builddir)/lib/libvgz/libvgz.la \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@ \
${LIBM} ${PTHREAD_LIBS}
varnishtest_CFLAGS = \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@ \
-DTOP_BUILDDIR='"${top_builddir}"'
EXTRA_DIST = $(top_srcdir)/bin/varnishtest/tests/*.vtc \
diff --git a/bin/varnishtop/Makefile.am b/bin/varnishtop/Makefile.am
index f48e972..37919e6 100644
--- a/bin/varnishtop/Makefile.am
+++ b/bin/varnishtop/Makefile.am
@@ -18,9 +18,19 @@ varnishtop_SOURCES = varnishtop.c \
$(top_srcdir)/lib/libvarnish/vsb.c
+varnishtop_CFLAGS = \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+
varnishtop_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@ \
@CURSES_LIB@ ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
noinst_PROGRAMS = varnishtop_opt2rst
diff --git a/configure.ac b/configure.ac
index da9f7ca..f211ac7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,6 +279,46 @@ if test "$ac_cv_have_viz" = no; then
fi
CFLAGS="${save_CFLAGS}"
+UBSAN_CFLAGS=
+UBSAN_LDFLAGS=
+AC_ARG_ENABLE(ubsan,
+ AS_HELP_STRING([--enable-ubsan],[enable undefined behavior sanitizer (default is NO)]),
+ CFLAGS="${CFLAGS} -fPIC"
+ UBSAN_CFLAGS="-fsanitize=undefined -fPIE -fno-omit-frame-pointer"
+ UBSAN_LDFLAGS="-fsanitize=undefined -pie")
+AC_SUBST(UBSAN_CFLAGS)
+AC_SUBST(UBSAN_LDFLAGS)
+
+TSAN_CFLAGS=
+TSAN_LDFLAGS=
+AC_ARG_ENABLE(tsan,
+ AS_HELP_STRING([--enable-tsan],[enable thread sanitizer (default is NO)]),
+ CFLAGS="${CFLAGS} -fPIC"
+ TSAN_CFLAGS="-fsanitize=thread -fPIE -fno-omit-frame-pointer"
+ TSAN_LDFLAGS="-fsanitize=thread -pie")
+AC_SUBST(TSAN_CFLAGS)
+AC_SUBST(TSAN_LDFLAGS)
+
+ASAN_CFLAGS=
+ASAN_LDFLAGS=
+AC_ARG_ENABLE(asan,
+ AS_HELP_STRING([--enable-asan],[enable address sanitizer (default is NO)]),
+ CFLAGS="${CFLAGS} -fPIC"
+ ASAN_CFLAGS="-fsanitize=address -fPIE -fno-omit-frame-pointer"
+ ASAN_LDFLAGS="-fsanitize=address -pie")
+AC_SUBST(ASAN_CFLAGS)
+AC_SUBST(ASAN_LDFLAGS)
+
+MSAN_CFLAGS=
+MSAN_LDFLAGS=
+AC_ARG_ENABLE(msan,
+ AS_HELP_STRING([--enable-msan],[enable memory sanitizer (default is NO)]),
+ CFLAGS="${CFLAGS} -fPIC"
+ MSAN_CFLAGS="-fsanitize=memory -fPIE -fno-omit-frame-pointer"
+ MSAN_LDFLAGS="-fsanitize=memory -pie")
+AC_SUBST(MSAN_CFLAGS)
+AC_SUBST(MSAN_LDFLAGS)
+
# Use jemalloc on Linux
JEMALLOC_LDADD=
AC_ARG_WITH([jemalloc],
diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index b592cff..b8ed85e 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -36,8 +36,17 @@ libvarnish_la_SOURCES = \
vsha256.c \
vss.c
-libvarnish_la_CFLAGS = -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
-libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM} @PCRE_LIBS@
+libvarnish_la_CFLAGS = \
+ -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM} @PCRE_LIBS@ \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@
if ENABLE_TESTS
TESTS = vnum_c_test
diff --git a/lib/libvarnishapi/Makefile.am b/lib/libvarnishapi/Makefile.am
index c7fb0e4..dbaece1 100644
--- a/lib/libvarnishapi/Makefile.am
+++ b/lib/libvarnishapi/Makefile.am
@@ -44,9 +44,17 @@ libvarnishapi_la_SOURCES = \
libvarnishapi.map
libvarnishapi_la_CFLAGS = \
- -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
-
-libvarnishapi_la_LIBADD = @PCRE_LIBS@ @RT_LIBS@
+ -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+
+libvarnishapi_la_LIBADD = @PCRE_LIBS@ @RT_LIBS@ \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@
if HAVE_LD_VERSION_SCRIPT
libvarnishapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libvarnishapi.map
diff --git a/lib/libvarnishcompat/Makefile.am b/lib/libvarnishcompat/Makefile.am
index 78683c0..2b4c469 100644
--- a/lib/libvarnishcompat/Makefile.am
+++ b/lib/libvarnishcompat/Makefile.am
@@ -8,7 +8,17 @@ AM_LDFLAGS = $(AM_LT_LDFLAGS)
pkglib_LTLIBRARIES = libvarnishcompat.la
-libvarnishcompat_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
+libvarnishcompat_la_CFLAGS = \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+
+libvarnishcompat_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@
libvarnishcompat_la_SOURCES = \
daemon.c \
diff --git a/lib/libvcc/Makefile.am b/lib/libvcc/Makefile.am
index b5a6574..6f55208 100644
--- a/lib/libvcc/Makefile.am
+++ b/lib/libvcc/Makefile.am
@@ -8,7 +8,17 @@ AM_CPPFLAGS = \
pkglib_LTLIBRARIES = libvcc.la
-libvcc_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
+libvcc_la_CFLAGS = \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+
+libvcc_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@
libvcc_la_SOURCES = \
vcc_compile.h \
diff --git a/lib/libvgz/Makefile.am b/lib/libvgz/Makefile.am
index d9c0dae..7bbc9fd 100644
--- a/lib/libvgz/Makefile.am
+++ b/lib/libvgz/Makefile.am
@@ -3,8 +3,16 @@ AM_LDFLAGS = $(AM_LT_LDFLAGS)
pkglib_LTLIBRARIES = libvgz.la
-libvgz_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
-libvgz_la_CFLAGS = -D_LARGEFILE64_SOURCE=1 -DZLIB_CONST $(libvgz_extra_cflags)
+libvgz_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@
+libvgz_la_CFLAGS = -D_LARGEFILE64_SOURCE=1 -DZLIB_CONST $(libvgz_extra_cflags) \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
libvgz_la_SOURCES = \
adler32.c \
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index 9115713..e64a95a 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -13,7 +13,17 @@ vmodtoolargs = --strict
noinst_LTLIBRARIES = libvmod_debug.la
-libvmod_debug_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared -rpath /nowhere
+libvmod_debug_la_CFLAGS = \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+
+libvmod_debug_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared -rpath /nowhere \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@
libvmod_debug_la_SOURCES = \
vmod_debug.c \
diff --git a/lib/libvmod_directors/Makefile.am b/lib/libvmod_directors/Makefile.am
index 64b72a8..d58b108 100644
--- a/lib/libvmod_directors/Makefile.am
+++ b/lib/libvmod_directors/Makefile.am
@@ -12,7 +12,17 @@ vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs = --strict
vmod_LTLIBRARIES = libvmod_directors.la
-libvmod_directors_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
+libvmod_directors_la_CFLAGS = \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+
+libvmod_directors_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@
libvmod_directors_la_SOURCES = \
vdir.c \
diff --git a/lib/libvmod_std/Makefile.am b/lib/libvmod_std/Makefile.am
index 47dd5dc..f895478 100644
--- a/lib/libvmod_std/Makefile.am
+++ b/lib/libvmod_std/Makefile.am
@@ -13,7 +13,17 @@ vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs = --strict
vmod_LTLIBRARIES = libvmod_std.la
-libvmod_std_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
+libvmod_std_la_CFLAGS = \
+ @ASAN_CFLAGS@ \
+ @MSAN_CFLAGS@ \
+ @TSAN_CFLAGS@ \
+ @UBSAN_CFLAGS@
+
+libvmod_std_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared \
+ @ASAN_LDFLAGS@ \
+ @MSAN_LDFLAGS@ \
+ @TSAN_LDFLAGS@ \
+ @UBSAN_LDFLAGS@
libvmod_std_la_SOURCES = \
vmod_std.c \
More information about the varnish-commit
mailing list