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

[36720] Free event early (fixes race to free)

Browse Source 
Patch contributed by yhu2 <yadi.hu@windriver.com>.

(cherry picked from commit a338c2d947)
This commit is contained in:
Mukund Sivaraman
2014-08-05 16:58:23 +05:30
parent fe5e0de485
commit 37cfebcaee
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
3910. [bug] Fix races to free event during shutdown. [RT#36720]
3909. [bug] When computing the number of elements required for a
acl count_acl_elements could have a short count leading
to a assertion failure. Also zero out new acl elements

12
lib/dns/view.c
View File

@@ -624,6 +624,8 @@ resolver_shutdown(isc_task_t *task, isc_event_t *event) {
UNUSED(task);
isc_event_free(&event);
LOCK(&view->lock);
view->attributes |= DNS_VIEWATTR_RESSHUTDOWN;
@@ -631,8 +633,6 @@ resolver_shutdown(isc_task_t *task, isc_event_t *event) {
UNLOCK(&view->lock);
isc_event_free(&event);
if (done)
destroy(view);
}
@@ -648,6 +648,8 @@ adb_shutdown(isc_task_t *task, isc_event_t *event) {
UNUSED(task);
isc_event_free(&event);
LOCK(&view->lock);
view->attributes |= DNS_VIEWATTR_ADBSHUTDOWN;
@@ -655,8 +657,6 @@ adb_shutdown(isc_task_t *task, isc_event_t *event) {
UNLOCK(&view->lock);
isc_event_free(&event);
if (done)
destroy(view);
}
@@ -672,6 +672,8 @@ req_shutdown(isc_task_t *task, isc_event_t *event) {
UNUSED(task);
isc_event_free(&event);
LOCK(&view->lock);
view->attributes |= DNS_VIEWATTR_REQSHUTDOWN;
@@ -679,8 +681,6 @@ req_shutdown(isc_task_t *task, isc_event_t *event) {
UNLOCK(&view->lock);
isc_event_free(&event);
if (done)
destroy(view);
}