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

738. [bug] If a non-threadsafe sdb driver supported AXFR and

Browse Source 
received an AXFR request, it would deadlock or die
                        with an assertion failure.
(also some other cleanups)
This commit is contained in:
Brian Wellington
2001-02-13 20:11:15 +00:00
parent b27b26d710
commit f24c135e09
2 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
738. [bug] If a non-threadsafe sdb driver supported AXFR and
received an AXFR request, it would deadlock or die
with an assertion failure.
737. [port] stdtime failed to compile on certain platforms. 737. [port] stdtime failed to compile on certain platforms.
736. [func] New functions isc_task_{begin,end}exclusive(). 736. [func] New functions isc_task_{begin,end}exclusive().

61
lib/dns/sdb.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: sdb.c,v 1.25 2001/02/05 19:47:04 bwelling Exp $ */ /* $Id: sdb.c,v 1.26 2001/02/13 20:11:15 bwelling Exp $ */
#include <config.h> #include <config.h>
@@ -62,6 +62,7 @@ struct dns_sdb {
dns_sdbimplementation_t *implementation; dns_sdbimplementation_t *implementation;
void *dbdata; void *dbdata;
isc_mutex_t lock; isc_mutex_t lock;
isc_mutex_t driverlock;
/* Locked */ /* Locked */
unsigned int references; unsigned int references;
@@ -118,14 +119,14 @@ typedef struct sdb_rdatasetiter {
do { \ do { \
unsigned int flags = sdb->implementation->flags; \ unsigned int flags = sdb->implementation->flags; \
if ((flags & DNS_SDBFLAG_THREADSAFE) == 0) \ if ((flags & DNS_SDBFLAG_THREADSAFE) == 0) \
LOCK(&sdb->lock); \ LOCK(&sdb->driverlock); \
} while (0) } while (0)
#define MAYBE_UNLOCK(sdb) \ #define MAYBE_UNLOCK(sdb) \
do { \ do { \
unsigned int flags = sdb->implementation->flags; \ unsigned int flags = sdb->implementation->flags; \
if ((flags & DNS_SDBFLAG_THREADSAFE) == 0) \ if ((flags & DNS_SDBFLAG_THREADSAFE) == 0) \
UNLOCK(&sdb->lock); \ UNLOCK(&sdb->driverlock); \
} while (0) } while (0)
static int dummy; static int dummy;
@@ -471,6 +472,7 @@ destroy(dns_sdb_t *sdb) {
isc_mem_free(mctx, sdb->zone); isc_mem_free(mctx, sdb->zone);
DESTROYLOCK(&sdb->lock); DESTROYLOCK(&sdb->lock);
DESTROYLOCK(&sdb->driverlock);
sdb->common.magic = 0; sdb->common.magic = 0;
sdb->common.impmagic = 0; sdb->common.impmagic = 0;
@@ -581,7 +583,6 @@ createnode(dns_sdb_t *sdb, dns_sdbnode_t **nodep) {
node->name = NULL; node->name = NULL;
result = isc_mutex_init(&node->lock); result = isc_mutex_init(&node->lock);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
isc_mem_put(sdb->common.mctx, sdb, sizeof(dns_sdb_t));
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() failed: %s", "isc_mutex_init() failed: %s",
isc_result_totext(result)); isc_result_totext(result));
@@ -1172,39 +1173,45 @@ dns_sdb_create(isc_mem_t *mctx, dns_name_t *origin, dns_dbtype_t type,
result = isc_mutex_init(&sdb->lock); result = isc_mutex_init(&sdb->lock);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
isc_mem_put(mctx, sdb, sizeof(dns_sdb_t));
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() failed: %s", "isc_mutex_init() failed: %s",
isc_result_totext(result)); isc_result_totext(result));
isc_mem_detach(&sdb->common.mctx); result = ISC_R_UNEXPECTED;
return (ISC_R_UNEXPECTED); goto cleanup_mctx;
} }
result = dns_name_dupwithoffsets(origin, mctx, &sdb->common.origin); result = isc_mutex_init(&sdb->driverlock);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
destroy(sdb); UNEXPECTED_ERROR(__FILE__, __LINE__,
return (result); "isc_mutex_init() failed: %s",
isc_result_totext(result));
result = ISC_R_UNEXPECTED;
goto cleanup_lock;
} }
result = dns_name_dupwithoffsets(origin, mctx, &sdb->common.origin);
if (result != ISC_R_SUCCESS)
goto cleanup_driverlock;
isc_buffer_init(&b, zonestr, sizeof(zonestr)); isc_buffer_init(&b, zonestr, sizeof(zonestr));
result = dns_name_totext(origin, ISC_TRUE, &b); result = dns_name_totext(origin, ISC_TRUE, &b);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS)
destroy(sdb); goto cleanup_origin;
return (result);
}
isc_buffer_putuint8(&b, 0); isc_buffer_putuint8(&b, 0);
sdb->zone = isc_mem_strdup(mctx, zonestr); sdb->zone = isc_mem_strdup(mctx, zonestr);
if (sdb->zone == NULL) { if (sdb->zone == NULL) {
destroy(sdb); result = ISC_R_NOMEMORY;
return (ISC_R_NOMEMORY); goto cleanup_origin;
} }
sdb->dbdata = NULL; sdb->dbdata = NULL;
if (imp->methods->create != NULL) { if (imp->methods->create != NULL) {
result = imp->methods->create(sdb->zone, argc, argv, result = imp->methods->create(sdb->zone, argc, argv,
imp->driverdata, &sdb->dbdata); imp->driverdata, &sdb->dbdata);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS)
destroy(sdb); goto cleanup_zonestr;
return (result);
}
} }
sdb->references = 1; sdb->references = 1;
@@ -1215,6 +1222,20 @@ dns_sdb_create(isc_mem_t *mctx, dns_name_t *origin, dns_dbtype_t type,
*dbp = (dns_db_t *)sdb; *dbp = (dns_db_t *)sdb;
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
cleanup_zonestr:
isc_mem_free(mctx, sdb->zone);
cleanup_origin:
dns_name_free(&sdb->common.origin, mctx);
cleanup_driverlock:
isc_mutex_destroy(&sdb->driverlock);
cleanup_lock:
isc_mutex_destroy(&sdb->lock);
cleanup_mctx:
isc_mem_put(mctx, sdb, sizeof(dns_sdb_t));
isc_mem_detach(&mctx);
return (result);
} }