mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-09 00:53:50 -04:00
Merge branch 'aram/dns_xfrin_create-use-after-free' into 'main'
Fix a use-after-free bug in dns_xfrin_create() See merge request isc-projects/bind9!7832
This commit is contained in:
commit
546312f06c
2 changed files with 4 additions and 4 deletions
3
CHANGES
3
CHANGES
|
|
@ -1,3 +1,6 @@
|
|||
6148. [bug] Fix a use-after-free bug in dns_xfrin_create().
|
||||
[GL !7832]
|
||||
|
||||
6147. [performance] Fix the TCP server parent quota use. [GL #3985]
|
||||
|
||||
6146. [performance] Replace the zone table red-black tree and associated
|
||||
|
|
|
|||
|
|
@ -723,6 +723,7 @@ dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
|
|||
if (result != ISC_R_SUCCESS) {
|
||||
atomic_store(&xfr->shuttingdown, true);
|
||||
xfr->shutdown_result = result;
|
||||
xfrin_log(xfr, ISC_LOG_ERROR, "zone transfer setup failed");
|
||||
dns_xfrin_detach(xfrp);
|
||||
}
|
||||
|
||||
|
|
@ -730,10 +731,6 @@ dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
|
|||
dns_db_detach(&db);
|
||||
}
|
||||
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
xfrin_log(xfr, ISC_LOG_ERROR, "zone transfer setup failed");
|
||||
}
|
||||
|
||||
return (result);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue