upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 07:19:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3351-checkconf-overflow-v9_18' into 'v9_18'

Browse source 
prevent a possible buffer overflow in configuration check

See merge request isc-projects/bind9!6304
This commit is contained in:
Evan Hunt 2022-05-14 03:49:45 +00:00
commit eaf5745554
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/bind9/check.c
View file

@ -3011,8 +3011,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
} else if (dns_name_isula(zname)) {
ula = true;
}
tmp += strlen(tmp);
len -= strlen(tmp);
tmp += strlen(tmp);
(void)snprintf(tmp, len, "%u/%s", zclass,
(ztype == CFG_ZONE_INVIEW) ? target
: (viewname != NULL) ? viewname
@ -3721,8 +3721,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
char *tmp = keydirbuf;
size_t len = sizeof(keydirbuf);
dns_name_format(zname, keydirbuf, sizeof(keydirbuf));
tmp += strlen(tmp);
len -= strlen(tmp);
tmp += strlen(tmp);
(void)snprintf(tmp, len, "/%s", (dir == NULL) ? "(null)" : dir);
tresult = keydirexist(zconfig, (const char *)keydirbuf,
kaspname, keydirs, logctx, mctx);