mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

"rndc freeze" could trigger an assertion in named when called on a

Browse Source 
nonexistent zone. [rt18050]
This commit is contained in:
Evan Hunt
2008-05-13 01:20:24 +00:00
parent 68cd13fff2
commit c72279e756
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
2370. [bug] "rndc freeze" could trigger an assertion in named
when called on a nonexistent zone. [RT #18050]
2369. [bug] libbind: Array bounds overrun on read in bitncmp(). 2369. [bug] libbind: Array bounds overrun on read in bitncmp().
[RT #18054] [RT #18054]

23
lib/dns/view.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: view.c,v 1.146 2008/04/03 05:55:52 marka Exp $ */ /* $Id: view.c,v 1.147 2008/05/13 01:20:24 each Exp $ */
/*! \file */ /*! \file */
@@ -1161,6 +1161,7 @@ dns_viewlist_findzone(dns_viewlist_t *list, dns_name_t *name,
dns_view_t *view; dns_view_t *view;
isc_result_t result; isc_result_t result;
dns_zone_t *zone1 = NULL, *zone2 = NULL; dns_zone_t *zone1 = NULL, *zone2 = NULL;
dns_zone_t **zp = NULL;;
REQUIRE(list != NULL); REQUIRE(list != NULL);
for (view = ISC_LIST_HEAD(*list); for (view = ISC_LIST_HEAD(*list);
@@ -1168,9 +1169,23 @@ dns_viewlist_findzone(dns_viewlist_t *list, dns_name_t *name,
view = ISC_LIST_NEXT(view, link)) { view = ISC_LIST_NEXT(view, link)) {
if (allclasses == ISC_FALSE && view->rdclass != rdclass) if (allclasses == ISC_FALSE && view->rdclass != rdclass)
continue; continue;
result = dns_zt_find(view->zonetable, name, 0, NULL,
(zone1 == NULL) ? &zone1 : &zone2); /*
INSIST(result == ISC_R_SUCCESS || result == ISC_R_NOTFOUND); * If the zone is defined in more than one view,
* treat it as not found.
*/
zp = (zone1 == NULL) ? &zone1 : &zone2;
result = dns_zt_find(view->zonetable, name, 0, NULL, zp);
INSIST(result == ISC_R_SUCCESS ||
result == ISC_R_NOTFOUND ||
result == DNS_R_PARTIALMATCH);
/* Treat a partial match as no match */
if (result == DNS_R_PARTIALMATCH) {
dns_zone_detach(zp);
result = ISC_R_NOTFOUND;
}
if (zone2 != NULL) { if (zone2 != NULL) {
dns_zone_detach(&zone1); dns_zone_detach(&zone1);
dns_zone_detach(&zone2); dns_zone_detach(&zone2);