From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 17 Jun 2026 14:02:21 +0000 (+0200)
Subject: - Fix that fast_reload does not terminate the server
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fff6657cea164f52c5330c5af8c6cbed6d71e722;p=thirdparty%2Funbound.git

- Fix that fast_reload does not terminate the server
  on malloc failure for dnstap, or if gethostname fails.
  Thanks to Qifan Zhang, Palo Alto Networks, for the report.
---

diff --git a/daemon/remote.c b/daemon/remote.c
index fa5a8c0d7..df1220108 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -6673,9 +6673,12 @@ fr_reload_config(struct fast_reload_thread* fr, struct config_file* newcfg,
 	}
 #ifdef USE_DNSTAP
 	if(env->cfg->dnstap) {
-		if(!fr->fr_nopause)
-			dt_apply_cfg(daemon->dtenv, env->cfg);
-		else dt_apply_logcfg(daemon->dtenv, env->cfg);
+		if(!fr->fr_nopause) {
+			if(!dt_apply_cfg(daemon->dtenv, env->cfg))
+				log_warn("fast_reload: dnstap identity/version metadata not updated due to allocation failure");
+		} else {
+			dt_apply_logcfg(daemon->dtenv, env->cfg);
+		}
 	}
 #endif
 	fr_adjust_cache(env, ct->oldcfg);
diff --git a/dnstap/dnstap.c b/dnstap/dnstap.c
index 3b2730182..76bdced9a 100644
--- a/dnstap/dnstap.c
+++ b/dnstap/dnstap.c
@@ -176,26 +176,29 @@ dt_create(struct config_file* cfg)
 	env->dtio = dt_io_thread_create();
 	if(!env->dtio) {
 		log_err("malloc failure");
-		free(env);
+		dt_delete(env);
 		return NULL;
 	}
 	if(!dt_io_thread_apply_cfg(env->dtio, cfg)) {
-		dt_io_thread_delete(env->dtio);
-		free(env);
+		dt_delete(env);
+		return NULL;
+	}
+	if(!dt_apply_cfg(env, cfg)) {
+		dt_delete(env);
 		return NULL;
 	}
-	dt_apply_cfg(env, cfg);
 	return env;
 }
 
-static void
+static int
 dt_apply_identity(struct dt_env *env, struct config_file *cfg)
 {
 	char buf[MAXHOSTNAMELEN+1];
 	if (!cfg->dnstap_send_identity) {
 		free(env->identity);
 		env->identity = NULL;
-		return;
+		env->len_identity = 0;
+		return 1;
 	}
 	free(env->identity);
 	if (cfg->dnstap_identity == NULL || cfg->dnstap_identity[0] == 0) {
@@ -203,36 +206,49 @@ dt_apply_identity(struct dt_env *env, struct config_file *cfg)
 			buf[MAXHOSTNAMELEN] = 0;
 			env->identity = strdup(buf);
 		} else {
-			fatal_exit("dt_apply_identity: gethostname() failed");
+			log_err("dt_apply_identity: gethostname() failed: %s",
+				strerror(errno));
+			env->identity = NULL;
+			env->len_identity = 0;
+			return 0;
 		}
 	} else {
 		env->identity = strdup(cfg->dnstap_identity);
 	}
-	if (env->identity == NULL)
-		fatal_exit("dt_apply_identity: strdup() failed");
+	if (env->identity == NULL) {
+		log_err("dt_apply_identity: strdup() failed");
+		env->len_identity = 0;
+		return 0;
+	}
 	env->len_identity = (unsigned int)strlen(env->identity);
 	verbose(VERB_OPS, "dnstap identity field set to \"%s\"",
 		env->identity);
+	return 1;
 }
 
-static void
+static int
 dt_apply_version(struct dt_env *env, struct config_file *cfg)
 {
 	if (!cfg->dnstap_send_version) {
 		free(env->version);
 		env->version = NULL;
-		return;
+		env->len_version = 0;
+		return 1;
 	}
 	free(env->version);
 	if (cfg->dnstap_version == NULL || cfg->dnstap_version[0] == 0)
 		env->version = strdup(PACKAGE_STRING);
 	else
 		env->version = strdup(cfg->dnstap_version);
-	if (env->version == NULL)
-		fatal_exit("dt_apply_version: strdup() failed");
+	if (env->version == NULL) {
+		log_err("dt_apply_version: strdup() failed");
+		env->len_version = 0;
+		return 0;
+	}
 	env->len_version = (unsigned int)strlen(env->version);
 	verbose(VERB_OPS, "dnstap version field set to \"%s\"",
 		env->version);
+	return 1;
 }
 
 void
@@ -276,15 +292,18 @@ dt_apply_logcfg(struct dt_env *env, struct config_file *cfg)
 	lock_basic_unlock(&env->sample_lock);
 }
 
-void
+int
 dt_apply_cfg(struct dt_env *env, struct config_file *cfg)
 {
 	if (!cfg->dnstap)
-		return;
+		return 1;
 
-	dt_apply_identity(env, cfg);
-	dt_apply_version(env, cfg);
 	dt_apply_logcfg(env, cfg);
+	if(!dt_apply_identity(env, cfg))
+		return 0;
+	if(!dt_apply_version(env, cfg))
+		return 0;
+	return 1;
 }
 
 int
diff --git a/dnstap/dnstap.h b/dnstap/dnstap.h
index 4390a9cf1..c8cf265b4 100644
--- a/dnstap/dnstap.h
+++ b/dnstap/dnstap.h
@@ -102,9 +102,9 @@ dt_create(struct config_file* cfg);
  * Apply config settings.
  * @param env: dnstap environment object.
  * @param cfg: new config settings.
+ * @return false on failure.
  */
-void
-dt_apply_cfg(struct dt_env *env, struct config_file *cfg);
+int dt_apply_cfg(struct dt_env *env, struct config_file *cfg);
 
 /**
  * Apply config settings for log enable for message types.
diff --git a/doc/Changelog b/doc/Changelog
index a5351e39d..3c7f1961c 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -48,6 +48,9 @@
 	- Fix to check for malloc failure in rpz response create,
 	  for nodata and nxdomain, so it does not crash later.
 	  Thanks to Qifan Zhang, Palo Alto Networks, for the report.
+	- Fix that fast_reload does not terminate the server
+	  on malloc failure for dnstap, or if gethostname fails.
+	  Thanks to Qifan Zhang, Palo Alto Networks, for the report.
 
 16 June 2026: Wouter
 	- Fix to disallow $INCLUDE for secondary zones. Start up