- Fix compile with --enable-alloc-checks, reported by X41 D-Sec.

diff --git a/Makefile.in b/Makefile.in
index 9660c49aa14e168a46ee97ec96bba5f8d3beeb1e..4c37e590675633a2294af8694731c0e454ebc9dc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -160,6 +160,7 @@ SLDNS_SRC=sldns/keyraw.c sldns/sbuffer.c sldns/wire2str.c sldns/parse.c \
 sldns/parseutil.c sldns/rrdef.c sldns/str2wire.c
 SLDNS_OBJ=keyraw.lo sbuffer.lo wire2str.lo parse.lo parseutil.lo rrdef.lo \
 str2wire.lo
+SLDNS_ALLOCCHECK_EXTRA_OBJ=@SLDNS_ALLOCCHECK_EXTRA_OBJ@
 UNITTEST_SRC=testcode/unitanchor.c testcode/unitdname.c \
 testcode/unitlruhash.c testcode/unitmain.c testcode/unitmsgparse.c \
 testcode/unitneg.c testcode/unitregional.c testcode/unitslabhash.c \
@@ -187,11 +188,11 @@ CONTROL_OBJ_LINK=$(CONTROL_OBJ) worker_cb.lo $(COMMON_OBJ_ALL_SYMBOLS) \
 $(SLDNS_OBJ) $(COMPAT_OBJ) @WIN_CONTROL_OBJ_LINK@
 HOST_SRC=smallapp/unbound-host.c
 HOST_OBJ=unbound-host.lo
-HOST_OBJ_LINK=$(HOST_OBJ) $(SLDNS_OBJ) $(COMPAT_OBJ_WITHOUT_CTIMEARC4) @WIN_HOST_OBJ_LINK@
+HOST_OBJ_LINK=$(HOST_OBJ) $(SLDNS_OBJ) $(COMPAT_OBJ_WITHOUT_CTIMEARC4) $(SLDNS_ALLOCCHECK_EXTRA_OBJ) @WIN_HOST_OBJ_LINK@
 UBANCHOR_SRC=smallapp/unbound-anchor.c
 UBANCHOR_OBJ=unbound-anchor.lo
 UBANCHOR_OBJ_LINK=$(UBANCHOR_OBJ) parseutil.lo \
-$(COMPAT_OBJ_WITHOUT_CTIME) @WIN_UBANCHOR_OBJ_LINK@
+$(COMPAT_OBJ_WITHOUT_CTIME) $(SLDNS_ALLOCCHECK_EXTRA_OBJ) @WIN_UBANCHOR_OBJ_LINK@
 TESTBOUND_SRC=testcode/testbound.c testcode/testpkts.c \
 daemon/worker.c daemon/acl_list.c \
 daemon/daemon.c daemon/stats.c \
@@ -217,7 +218,7 @@ MEMSTATS_OBJ_LINK=$(MEMSTATS_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) \
 $(SLDNS_OBJ)
 ASYNCLOOK_SRC=testcode/asynclook.c
 ASYNCLOOK_OBJ=asynclook.lo
-ASYNCLOOK_OBJ_LINK=$(ASYNCLOOK_OBJ) log.lo locks.lo $(COMPAT_OBJ)
+ASYNCLOOK_OBJ_LINK=$(ASYNCLOOK_OBJ) log.lo locks.lo $(COMPAT_OBJ) @ASYNCLOOK_ALLOCCHECK_EXTRA_OBJ@
 STREAMTCP_SRC=testcode/streamtcp.c
 STREAMTCP_OBJ=streamtcp.lo
 STREAMTCP_OBJ_LINK=$(STREAMTCP_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) \

diff --git a/configure b/configure
index 17b1c2d48628147b8f92b0c0f8653ab829959c5a..446c548884c458904004b5bf45aa43e695ac62d2 100755 (executable)
--- a/configure
+++ b/configure
@@ -702,6 +702,8 @@ PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_CC
 ax_pthread_config
+ASYNCLOOK_ALLOCCHECK_EXTRA_OBJ
+SLDNS_ALLOCCHECK_EXTRA_OBJ
 USE_SYSTEMD_FALSE
 USE_SYSTEMD_TRUE
 SYSTEMD_DAEMON_LIBS
@@ -16376,6 +16378,10 @@ if test x_$enable_alloc_checks = x_yes; then
 
 $as_echo "#define UNBOUND_ALLOC_STATS 1" >>confdefs.h
 
+       SLDNS_ALLOCCHECK_EXTRA_OBJ="alloc.lo log.lo"
+
+       ASYNCLOOK_ALLOCCHECK_EXTRA_OBJ="alloc.lo"
+
 else
        if test x_$enable_alloc_lite = x_yes; then
 

diff --git a/configure.ac b/configure.ac
index 3d58e36e52df8e6ee80adcd55218f6af25a41a6c..5276d441620e0d530d94e8bc74277cd418ae779a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -503,6 +503,10 @@ if test x_$enable_alloc_nonregional = x_yes; then
 fi
 if test x_$enable_alloc_checks = x_yes; then
        AC_DEFINE(UNBOUND_ALLOC_STATS, 1, [use statistics for allocs and frees, for debug use])
+       SLDNS_ALLOCCHECK_EXTRA_OBJ="alloc.lo log.lo"
+       AC_SUBST(SLDNS_ALLOCCHECK_EXTRA_OBJ)
+       ASYNCLOOK_ALLOCCHECK_EXTRA_OBJ="alloc.lo"
+       AC_SUBST(ASYNCLOOK_ALLOCCHECK_EXTRA_OBJ)
 else
        if test x_$enable_alloc_lite = x_yes; then
                AC_DEFINE(UNBOUND_ALLOC_LITE, 1, [use to enable lightweight alloc assertions, for debug use])

diff --git a/doc/Changelog b/doc/Changelog
index 72c736a9828955406620b4c7d09912dc40b134a8..9d5db1a54246b3193a6e08ef56777206a0639f7a 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -30,6 +30,7 @@
          ifdef stdint.h inclusion for older systems.
          ifdef sha2.h inclusion for older systems.
        - Fixed Compat Code Diverging from Upstream, reported by X41 D-Sec.
+       - Fix compile with --enable-alloc-checks, reported by X41 D-Sec.
 
 19 November 2019: Wouter
        - Fix CVE-2019-18934, shell execution in ipsecmod.