mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

2238. [bug] It was possible to trigger a REQUIRE when a

Browse Source 
validation was cancelled. [RT #17106]
This commit is contained in:
Mark Andrews
2007-09-14 05:43:05 +00:00
parent a7b7a4ebc3
commit e2c3f8059e
3 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
2238. [bug] It was possible to trigger a REQUIRE when a
validation was cancelled. [RT #17106]
2237. [bug] libbind: res_init() was not thread aware. [RT #17123] 2237. [bug] libbind: res_init() was not thread aware. [RT #17123]
2236. [bug] dnssec-signzone failed to preserve the case of 2236. [bug] dnssec-signzone failed to preserve the case of

37
lib/dns/resolver.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: resolver.c,v 1.351 2007/09/06 10:00:19 marka Exp $ */ /* $Id: resolver.c,v 1.352 2007/09/14 05:43:05 marka Exp $ */
/*! \file */ /*! \file */
@@ -195,6 +195,7 @@ struct fetchctx {
isc_sockaddrlist_t bad; isc_sockaddrlist_t bad;
isc_sockaddrlist_t edns; isc_sockaddrlist_t edns;
isc_sockaddrlist_t edns512; isc_sockaddrlist_t edns512;
dns_validator_t *validator;
ISC_LIST(dns_validator_t) validators; ISC_LIST(dns_validator_t) validators;
dns_db_t * cache; dns_db_t * cache;
dns_adb_t * adb; dns_adb_t * adb;
@@ -426,9 +427,13 @@ valcreate(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, dns_name_t *name,
sigrdataset, fctx->rmessage, sigrdataset, fctx->rmessage,
valoptions, task, validated, valarg, valoptions, task, validated, valarg,
&validator); &validator);
if (result == ISC_R_SUCCESS) if (result == ISC_R_SUCCESS) {
if ((valoptions & DNS_VALIDATOR_DEFER) == 0) {
INSIST(fctx->validator == NULL);
fctx->validator = validator;
}
ISC_LIST_APPEND(fctx->validators, validator, link); ISC_LIST_APPEND(fctx->validators, validator, link);
else } else
isc_mem_put(fctx->res->buckets[fctx->bucketnum].mctx, isc_mem_put(fctx->res->buckets[fctx->bucketnum].mctx,
valarg, sizeof(*valarg)); valarg, sizeof(*valarg));
return (result); return (result);
@@ -3040,6 +3045,7 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
ISC_LIST_INIT(fctx->edns); ISC_LIST_INIT(fctx->edns);
ISC_LIST_INIT(fctx->edns512); ISC_LIST_INIT(fctx->edns512);
ISC_LIST_INIT(fctx->validators); ISC_LIST_INIT(fctx->validators);
fctx->validator = NULL;
fctx->find = NULL; fctx->find = NULL;
fctx->altfind = NULL; fctx->altfind = NULL;
fctx->pending = 0; fctx->pending = 0;
@@ -3378,7 +3384,7 @@ maybe_destroy(fetchctx_t *fctx) {
unsigned int bucketnum; unsigned int bucketnum;
isc_boolean_t bucket_empty = ISC_FALSE; isc_boolean_t bucket_empty = ISC_FALSE;
dns_resolver_t *res = fctx->res; dns_resolver_t *res = fctx->res;
dns_validator_t *validator; dns_validator_t *validator, *next_validator;
REQUIRE(SHUTTINGDOWN(fctx)); REQUIRE(SHUTTINGDOWN(fctx));
@@ -3386,16 +3392,22 @@ maybe_destroy(fetchctx_t *fctx) {
return; return;
for (validator = ISC_LIST_HEAD(fctx->validators); for (validator = ISC_LIST_HEAD(fctx->validators);
validator != NULL; validator != NULL; validator = next_validator) {
validator = ISC_LIST_HEAD(fctx->validators)) { next_validator = ISC_LIST_NEXT(validator, link);
ISC_LIST_UNLINK(fctx->validators, validator, link);
dns_validator_cancel(validator); dns_validator_cancel(validator);
/*
* If this is a active validator wait for the cancel
* to complete before calling dns_validator_destroy().
*/
if (validator == fctx->validator)
continue;
ISC_LIST_UNLINK(fctx->validators, validator, link);
dns_validator_destroy(&validator); dns_validator_destroy(&validator);
} }
bucketnum = fctx->bucketnum; bucketnum = fctx->bucketnum;
LOCK(&res->buckets[bucketnum].lock); LOCK(&res->buckets[bucketnum].lock);
if (fctx->references == 0) if (fctx->references == 0 && ISC_LIST_EMPTY(fctx->validators))
bucket_empty = fctx_destroy(fctx); bucket_empty = fctx_destroy(fctx);
UNLOCK(&res->buckets[bucketnum].lock); UNLOCK(&res->buckets[bucketnum].lock);
@@ -3442,6 +3454,7 @@ validated(isc_task_t *task, isc_event_t *event) {
FCTXTRACE("received validation completion event"); FCTXTRACE("received validation completion event");
ISC_LIST_UNLINK(fctx->validators, vevent->validator, link); ISC_LIST_UNLINK(fctx->validators, vevent->validator, link);
fctx->validator = NULL;
/* /*
* Destroy the validator early so that we can * Destroy the validator early so that we can
@@ -3527,9 +3540,11 @@ validated(isc_task_t *task, isc_event_t *event) {
add_bad(fctx, addrinfo, result); add_bad(fctx, addrinfo, result);
isc_event_free(&event); isc_event_free(&event);
UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock); UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
if (!ISC_LIST_EMPTY(fctx->validators)) INSIST(fctx->validator == NULL);
dns_validator_send(ISC_LIST_HEAD(fctx->validators)); fctx->validator = ISC_LIST_HEAD(fctx->validators);
else if (sentresponse) if (fctx->validator != NULL) {
dns_validator_send(fctx->validator);
} else if (sentresponse)
fctx_done(fctx, result); /* Locks bucket. */ fctx_done(fctx, result); /* Locks bucket. */
else else
fctx_try(fctx); /* Locks bucket. */ fctx_try(fctx); /* Locks bucket. */

29
lib/dns/validator.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: validator.c,v 1.153 2007/08/27 04:36:54 marka Exp $ */ /* $Id: validator.c,v 1.154 2007/09/14 05:43:05 marka Exp $ */
#include <config.h> #include <config.h>
@@ -87,6 +87,7 @@
#define VALID_VALIDATOR(v) ISC_MAGIC_VALID(v, VALIDATOR_MAGIC) #define VALID_VALIDATOR(v) ISC_MAGIC_VALID(v, VALIDATOR_MAGIC)
#define VALATTR_SHUTDOWN 0x0001 /*%< Shutting down. */ #define VALATTR_SHUTDOWN 0x0001 /*%< Shutting down. */
#define VALATTR_CANCELED 0x0002 /*%< Cancelled. */
#define VALATTR_TRIEDVERIFY 0x0004 /*%< We have found a key and #define VALATTR_TRIEDVERIFY 0x0004 /*%< We have found a key and
* have attempted a verify. */ * have attempted a verify. */
#define VALATTR_INSECURITY 0x0010 /*%< Attempting proveunsecure. */ #define VALATTR_INSECURITY 0x0010 /*%< Attempting proveunsecure. */
@@ -112,6 +113,7 @@
#define DLVTRIED(val) ((val->attributes & VALATTR_DLVTRIED) != 0) #define DLVTRIED(val) ((val->attributes & VALATTR_DLVTRIED) != 0)
#define SHUTDOWN(v) (((v)->attributes & VALATTR_SHUTDOWN) != 0) #define SHUTDOWN(v) (((v)->attributes & VALATTR_SHUTDOWN) != 0)
#define CANCELED(v) (((v)->attributes & VALATTR_CANCELED) != 0)
static void static void
destroy(dns_validator_t *val); destroy(dns_validator_t *val);
@@ -278,7 +280,9 @@ fetch_callback_validator(isc_task_t *task, isc_event_t *event) {
validator_log(val, ISC_LOG_DEBUG(3), "in fetch_callback_validator"); validator_log(val, ISC_LOG_DEBUG(3), "in fetch_callback_validator");
LOCK(&val->lock); LOCK(&val->lock);
if (eresult == ISC_R_SUCCESS) { if (CANCELED(val)) {
validator_done(val, ISC_R_CANCELED);
} else if (eresult == ISC_R_SUCCESS) {
validator_log(val, ISC_LOG_DEBUG(3), validator_log(val, ISC_LOG_DEBUG(3),
"keyset with trust %d", rdataset->trust); "keyset with trust %d", rdataset->trust);
/* /*
@@ -342,7 +346,9 @@ dsfetched(isc_task_t *task, isc_event_t *event) {
validator_log(val, ISC_LOG_DEBUG(3), "in dsfetched"); validator_log(val, ISC_LOG_DEBUG(3), "in dsfetched");
LOCK(&val->lock); LOCK(&val->lock);
if (eresult == ISC_R_SUCCESS) { if (CANCELED(val)) {
validator_done(val, ISC_R_CANCELED);
} else if (eresult == ISC_R_SUCCESS) {
validator_log(val, ISC_LOG_DEBUG(3), validator_log(val, ISC_LOG_DEBUG(3),
"dsset with trust %d", rdataset->trust); "dsset with trust %d", rdataset->trust);
val->dsset = &val->frdataset; val->dsset = &val->frdataset;
@@ -415,7 +421,9 @@ dsfetched2(isc_task_t *task, isc_event_t *event) {
validator_log(val, ISC_LOG_DEBUG(3), "in dsfetched2: %s", validator_log(val, ISC_LOG_DEBUG(3), "in dsfetched2: %s",
dns_result_totext(eresult)); dns_result_totext(eresult));
LOCK(&val->lock); LOCK(&val->lock);
if (eresult == DNS_R_NXRRSET || eresult == DNS_R_NCACHENXRRSET) { if (CANCELED(val)) {
validator_done(val, ISC_R_CANCELED);
} else if (eresult == DNS_R_NXRRSET || eresult == DNS_R_NCACHENXRRSET) {
/* /*
* There is no DS. If this is a delegation, we're done. * There is no DS. If this is a delegation, we're done.
*/ */
@@ -490,7 +498,9 @@ keyvalidated(isc_task_t *task, isc_event_t *event) {
validator_log(val, ISC_LOG_DEBUG(3), "in keyvalidated"); validator_log(val, ISC_LOG_DEBUG(3), "in keyvalidated");
LOCK(&val->lock); LOCK(&val->lock);
if (eresult == ISC_R_SUCCESS) { if (CANCELED(val)) {
validator_done(val, ISC_R_CANCELED);
} else if (eresult == ISC_R_SUCCESS) {
validator_log(val, ISC_LOG_DEBUG(3), validator_log(val, ISC_LOG_DEBUG(3),
"keyset with trust %d", val->frdataset.trust); "keyset with trust %d", val->frdataset.trust);
/* /*
@@ -540,7 +550,9 @@ dsvalidated(isc_task_t *task, isc_event_t *event) {
validator_log(val, ISC_LOG_DEBUG(3), "in dsvalidated"); validator_log(val, ISC_LOG_DEBUG(3), "in dsvalidated");
LOCK(&val->lock); LOCK(&val->lock);
if (eresult == ISC_R_SUCCESS) { if (CANCELED(val)) {
validator_done(val, ISC_R_CANCELED);
} else if (eresult == ISC_R_SUCCESS) {
validator_log(val, ISC_LOG_DEBUG(3), validator_log(val, ISC_LOG_DEBUG(3),
"dsset with trust %d", val->frdataset.trust); "dsset with trust %d", val->frdataset.trust);
if ((val->attributes & VALATTR_INSECURITY) != 0) if ((val->attributes & VALATTR_INSECURITY) != 0)
@@ -749,7 +761,9 @@ authvalidated(isc_task_t *task, isc_event_t *event) {
validator_log(val, ISC_LOG_DEBUG(3), "in authvalidated"); validator_log(val, ISC_LOG_DEBUG(3), "in authvalidated");
LOCK(&val->lock); LOCK(&val->lock);
if (result != ISC_R_SUCCESS) { if (CANCELED(val)) {
validator_done(val, ISC_R_CANCELED);
} else if (result != ISC_R_SUCCESS) {
validator_log(val, ISC_LOG_DEBUG(3), validator_log(val, ISC_LOG_DEBUG(3),
"authvalidated: got %s", "authvalidated: got %s",
isc_result_totext(result)); isc_result_totext(result));
@@ -2932,6 +2946,7 @@ dns_validator_cancel(dns_validator_t *validator) {
isc_event_free((isc_event_t **)&validator->event); isc_event_free((isc_event_t **)&validator->event);
isc_task_detach(&task); isc_task_detach(&task);
} }
validator->attributes |= VALATTR_CANCELED;
} }
UNLOCK(&validator->lock); UNLOCK(&validator->lock);
} }