From: Ondřej Surý <ondrej@isc.org>
Date: Wed, 8 Jan 2020 07:57:21 +0000 (+0100)
Subject: Add missing locks to isc_logconfig_get and disable thread sanitizer for isc_log_wouldlog
X-Git-Tag: v9.15.8~24^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91e1981988df34f43aae1c791f1c1df148071fc4;p=thirdparty%2Fbind9.git

Add missing locks to isc_logconfig_get and disable thread sanitizer for isc_log_wouldlog
---

diff --git a/lib/isc/log.c b/lib/isc/log.c
index 3d60ca2fad6..fe560b5adff 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -397,9 +397,13 @@ isc_logconfig_t *
 isc_logconfig_get(isc_log_t *lctx) {
 	REQUIRE(VALID_CONTEXT(lctx));
 
-	ENSURE(lctx->logconfig != NULL);
+	isc_logconfig_t *lcfg = NULL;
+	LOCK(&lctx->lock);
+	lcfg = lctx->logconfig;
+	UNLOCK(&lctx->lock);
 
-	return (lctx->logconfig);
+	ENSURE(lcfg != NULL);
+	return (lcfg);
 }
 
 isc_result_t
@@ -1458,7 +1462,7 @@ isc_log_open(isc_logchannel_t *channel) {
 }
 
 bool
-isc_log_wouldlog(isc_log_t *lctx, int level) {
+isc_log_wouldlog(isc_log_t *lctx, int level) ISC_NO_SANITIZE {
 	/*
 	 * Try to avoid locking the mutex for messages which can't
 	 * possibly be logged to any channels -- primarily debugging