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

[master] address race conditions with removing inline zones

Browse Source 
3513.	[bug]		named could crash when deleting inline-signing
			zones with "rndc delzone". [RT #34066]
This commit is contained in:
Evan Hunt
2013-07-09 17:39:21 -07:00
parent ca48f47d88
commit 927e4c9fec
10 changed files with 70 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/named/server.c
View File

@@ -8481,13 +8481,13 @@ inuse(const char* file, isc_boolean_t first, isc_buffer_t *text) {
if (file != NULL && isc_file_exists(file) &&
isc_buffer_availablelength(text) >
strlen(file) + (first ? sizeof(INUSEMSG) : 0))
strlen(file) + (first ? sizeof(INUSEMSG) : sizeof("\n")))
{
if (first)
isc__buffer_putstr(text, INUSEMSG);
isc_buffer_putstr(text, INUSEMSG);
else
isc_buffer_putstr(text, "\n");
isc__buffer_putstr(text, file);
isc_buffer_putstr(text, file);
return (ISC_FALSE);
}
return (first);
@@ -8670,6 +8670,7 @@ ns_server_del_zone(ns_server_t *server, char *args, isc_buffer_t *text) {
isc_buffer_putstr(text, "zone ");
isc_buffer_putstr(text, zonename);
isc_buffer_putstr(text, " and associated files deleted");
isc_buffer_putuint8(text, 0);
} else if (dns_zone_gettype(mayberaw) == dns_zone_slave ||
dns_zone_gettype(mayberaw) == dns_zone_stub)
{
@@ -8688,6 +8689,8 @@ ns_server_del_zone(ns_server_t *server, char *args, isc_buffer_t *text) {
file = dns_zone_getjournal(zone);
(void)inuse(file, first, text);
}
if (isc_buffer_availablelength(text) > 0)
isc_buffer_putuint8(text, 0);
}
CHECK(dns_zt_unmount(view->zonetable, zone));
@@ -8882,6 +8885,8 @@ ns_server_signing(ns_server_t *server, char *args, isc_buffer_t *text) {
isc_buffer_add(text, n);
}
if (!first && isc_buffer_availablelength(text) > 0)
isc_buffer_putuint8(text, 0);
if (result == ISC_R_NOMORE)
result = ISC_R_SUCCESS;