From: Willy Tarreau <w@1wt.eu>
Date: Thu, 14 Oct 2021 06:00:38 +0000 (+0200)
Subject: BUG/MINOR: resolvers: do not reject host names of length 255 in SRV records
X-Git-Tag: v2.5-dev10~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85c15e6bff92c2dae609d76f72c1d231d048dd74;p=thirdparty%2Fhaproxy.git

BUG/MINOR: resolvers: do not reject host names of length 255 in SRV records

An off-by-one issue in buffer size calculation used to limit the output
of resolv_dn_label_to_str() to 254 instead of 255.

This must be backported to 2.0.
---

diff --git a/src/resolvers.c b/src/resolvers.c
index aec66be242..66f032913d 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -778,10 +778,10 @@ srv_found:
 
 				if (!srv->hostname_dn) {
 					const char *msg = NULL;
-					char hostname[DNS_MAX_NAME_SIZE];
+					char hostname[DNS_MAX_NAME_SIZE+1];
 
 					if (resolv_dn_label_to_str(item->target, item->data_len+1,
-								hostname, DNS_MAX_NAME_SIZE) == -1) {
+					                           hostname, sizeof(hostname)) == -1) {
 						HA_SPIN_UNLOCK(SERVER_LOCK, &srv->lock);
 						continue;
 					}