ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Fix a leak of query fetchlock (#38454)

Browse Source 
4052.	[bug]		Fix a leak of query fetchlock. [RT #38454]

(cherry picked from commit 4eefa351cc)
This commit is contained in:
Mukund Sivaraman
2015-02-03 11:47:44 +05:30
parent ed436982c5
commit 718b30d039
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -1,3 +1,5 @@
4052. [bug] Fix a leak of query fetchlock. [RT #38454]
4051. [bug] Fix a leak of pthread_mutexattr_t. [RT #38454]
4049. [bug] CDS and CDNSKEY had the wrong attributes. [RT #38491]
bin/named/client.c
+18 -10
View File
@@ -546,6 +546,17 @@ exit_check(ns_client_t *client) {
INSIST(client->recursionquota == NULL);
INSIST(!ISC_QLINK_LINKED(client, ilink));
if (manager != NULL) {
LOCK(&manager->listlock);
ISC_LIST_UNLINK(manager->clients, client, link);
LOCK(&manager->lock);
if (manager->exiting &&
ISC_LIST_EMPTY(manager->clients))
destroy_manager = ISC_TRUE;
UNLOCK(&manager->lock);
UNLOCK(&manager->listlock);
}
ns_query_free(client);
isc_mem_put(client->mctx, client->recvbuf, RECV_BUFFER_SIZE);
isc_event_free((isc_event_t **)&client->sendevent);
@@ -565,16 +576,6 @@ exit_check(ns_client_t *client) {
}
dns_message_destroy(&client->message);
if (manager != NULL) {
LOCK(&manager->listlock);
ISC_LIST_UNLINK(manager->clients, client, link);
LOCK(&manager->lock);
if (manager->exiting &&
ISC_LIST_EMPTY(manager->clients))
destroy_manager = ISC_TRUE;
UNLOCK(&manager->lock);
UNLOCK(&manager->listlock);
}
/*
* Detaching the task must be done after unlinking from
@@ -595,6 +596,13 @@ exit_check(ns_client_t *client) {
isc_mem_stats(client->mctx, stderr);
INSIST(0);
}
/*
* Destroy the fetchlock mutex that was created in
* ns_query_init().
*/
DESTROYLOCK(&client->query.fetchlock);
isc_mem_putanddetach(&client->mctx, client, sizeof(*client));
}
bin/named/query.c
+7 -1
View File
@@ -618,6 +618,10 @@ ns_query_init(ns_client_t *client) {
client->query.timerset = ISC_FALSE;
client->query.rpz_st = NULL;
client->query.qname = NULL;
/*
* This mutex is destroyed when the client is destroyed in
* exit_check().
*/
result = isc_mutex_init(&client->query.fetchlock);
if (result != ISC_R_SUCCESS)
return (result);
@@ -638,8 +642,10 @@ ns_query_init(ns_client_t *client) {
return (result);
}
result = query_newnamebuf(client);
if (result != ISC_R_SUCCESS)
if (result != ISC_R_SUCCESS) {
query_freefreeversions(client, ISC_TRUE);
DESTROYLOCK(&client->query.fetchlock);
}
return (result);
}