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

Fix race in getaddrinfo() in libirs, which caused assertion failure in delv (#39873)

Browse Source
This commit is contained in:
Mukund Sivaraman
2015-06-29 19:44:42 +05:30
parent 08f0129732
commit c44c77178e
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@@ -1,3 +1,9 @@
4149. [bug] Fixed a race condition in the getaddrinfo()
implementation in libirs, which caused the delv
utility to crash with an assertion failure when using
the '@server' syntax with a hostname argument.
[RT #39899]
4148. [bug] Fix a bug when printing zone names with '/' character 4148. [bug] Fix a bug when printing zone names with '/' character
in XML and JSON statistics output. [RT #39873] in XML and JSON statistics output. [RT #39873]

17
lib/irs/getaddrinfo.c
View File

@@ -138,6 +138,7 @@
#include <isc/sockaddr.h> #include <isc/sockaddr.h>
#include <isc/string.h> #include <isc/string.h>
#include <isc/util.h> #include <isc/util.h>
#include <isc/mutex.h>
#include <dns/client.h> #include <dns/client.h>
#include <dns/fixedname.h> #include <dns/fixedname.h>
@@ -531,6 +532,7 @@ typedef struct gai_statehead {
int ai_port; int ai_port;
isc_appctx_t *actx; isc_appctx_t *actx;
dns_client_t *dnsclient; dns_client_t *dnsclient;
isc_mutex_t list_lock;
ISC_LIST(struct gai_resstate) resstates; ISC_LIST(struct gai_resstate) resstates;
unsigned int activestates; unsigned int activestates;
} gai_statehead_t; } gai_statehead_t;
@@ -858,6 +860,7 @@ process_answer(isc_task_t *task, isc_event_t *event) {
* and have any answer, we can stop now by canceling the * and have any answer, we can stop now by canceling the
* others. * others.
*/ */
LOCK(&resstate->head->list_lock);
if (resstate == ISC_LIST_HEAD(resstate->head->resstates)) { if (resstate == ISC_LIST_HEAD(resstate->head->resstates)) {
if ((resstate->trans4 != NULL && if ((resstate->trans4 != NULL &&
resstate->trans4->ai_sentinel.ai_next != NULL) || resstate->trans4->ai_sentinel.ai_next != NULL) ||
@@ -889,6 +892,7 @@ process_answer(isc_task_t *task, isc_event_t *event) {
resstate, link); resstate, link);
} }
} }
UNLOCK(&resstate->head->list_lock);
} }
} }
@@ -929,11 +933,19 @@ resolve_name(int family, const char *hostname, int flags,
head.ai_port = port; head.ai_port = port;
head.actx = actx; head.actx = actx;
head.dnsclient = client; head.dnsclient = client;
result = isc_mutex_init(&head.list_lock);
if (result != ISC_R_SUCCESS) {
return (EAI_FAIL);
}
ISC_LIST_INIT(head.resstates); ISC_LIST_INIT(head.resstates);
result = make_resstates(mctx, hostname, &head, conf); result = make_resstates(mctx, hostname, &head, conf);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS) {
DESTROYLOCK(&head.list_lock);
return (EAI_FAIL); return (EAI_FAIL);
}
LOCK(&head.list_lock);
for (resstate = ISC_LIST_HEAD(head.resstates); for (resstate = ISC_LIST_HEAD(head.resstates);
resstate != NULL; resstate = ISC_LIST_NEXT(resstate, link)) { resstate != NULL; resstate = ISC_LIST_NEXT(resstate, link)) {
if (resstate->trans4 != NULL) { if (resstate->trans4 != NULL) {
@@ -967,6 +979,8 @@ resolve_name(int family, const char *hostname, int flags,
resstate->trans6->is_inprogress= ISC_FALSE; resstate->trans6->is_inprogress= ISC_FALSE;
} }
} }
UNLOCK(&head.list_lock);
if (!all_fail) { if (!all_fail) {
/* Start all the events */ /* Start all the events */
isc_app_ctxrun(actx); isc_app_ctxrun(actx);
@@ -1038,6 +1052,7 @@ resolve_name(int family, const char *hostname, int flags,
irs_context_destroy(&irsctx); irs_context_destroy(&irsctx);
#endif #endif
DESTROYLOCK(&head.list_lock);
return (error); return (error);
} }