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

fix locking hierarchy violation [RT #1672]

Browse Source
This commit is contained in:
Andreas Gustafsson
2001-08-29 21:15:56 +00:00
parent 2c2b29b6ff
commit 9cb39bbe40
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/dns/request.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: request.c,v 1.64 2001/08/28 03:58:07 marka Exp $ */
/* $Id: request.c,v 1.65 2001/08/29 21:15:56 gson Exp $ */
#include <config.h>
@@ -1106,10 +1106,13 @@ dns_request_destroy(dns_request_t **requestp) {
req_log(ISC_LOG_DEBUG(3), "dns_request_destroy: request %p", request);
LOCK(&request->requestmgr->lock);
LOCK(&request->requestmgr->locks[request->hash]);
ISC_LIST_UNLINK(request->requestmgr->requests, request, link);
INSIST(!DNS_REQUEST_CONNECTING(request));
INSIST(!DNS_REQUEST_SENDING(request));
UNLOCK(&request->requestmgr->locks[request->hash]);
UNLOCK(&request->requestmgr->lock);
/*
* These should have been cleaned up by req_cancel() before
@@ -1323,15 +1326,6 @@ req_cancel(dns_request_t *request) {
*/
request->flags |= DNS_REQUEST_F_CANCELED;
/*
* Unlink from the manager here so that it will not try
* to cancel us after we have already sent the completion
* event.
*/
LOCK(&request->requestmgr->lock);
ISC_LIST_UNLINK(request->requestmgr->requests, request, link);
UNLOCK(&request->requestmgr->lock);
if (request->timer != NULL)
isc_timer_detach(&request->timer);
if (request->dispentry != NULL)