upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

check for val->name == NULL when adding EDE text

Browse source 
When a validator is being shut down, the associated name
`val->name` is set to NULL.  This could cause a crash if a worker
thread subsequently added an EDE code to the response containing
val->name in the extra text.

`validator_addede()` now checks whether the name is NULL before
trying to add it to the extra text.

(cherry picked from commit 2c60870527)
This commit is contained in:
Evan Hunt 2026-05-01 11:12:54 -07:00 committed by Mark Andrews
parent e962fd459e
commit c665472b10
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/dns/validator.c
View file

@ -3800,12 +3800,16 @@ validator_addede(dns_validator_t *val, uint16_t code, const char *extra) {
if (extra != NULL) {
isc_buffer_putstr(&b, extra);
isc_buffer_putuint8(&b, ' ');
}
dns_name_totext(val->name, DNS_NAME_OMITFINALDOT, &b);
isc_buffer_putuint8(&b, '/');
dns_rdatatype_totext(val->type, &b);
if (val->name != NULL) {
if (extra != NULL) {
isc_buffer_putuint8(&b, ' ');
}
dns_name_totext(val->name, DNS_NAME_OMITFINALDOT, &b);
isc_buffer_putuint8(&b, '/');
dns_rdatatype_totext(val->type, &b);
}
isc_buffer_putuint8(&b, '\0');
dns_ede_add(&val->edectx, code, bdata);