upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-15 02:29:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'value-not-updated-atomically' into 'master'

Browse source 
unlink before unlock

See merge request isc-projects/bind9!589
This commit is contained in:
Mark Andrews 2018-08-23 20:49:38 -04:00
commit 751c660b9d
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
5017. [bug] lib/isc/pk11.c failed to unlink the session before
releasing the lock which is unsafe. [GL !589]
5016. [bug] Named could assert with overlapping filter-aaaa and
dns64 acls. [GL #445]

2
lib/isc/pk11.c
View file

@ -401,6 +401,7 @@ free_session_list(pk11_sessionlist_t *slist) {
LOCK(&sessionlock);
while (!ISC_LIST_EMPTY(*slist)) {
sp = ISC_LIST_HEAD(*slist);
ISC_LIST_UNLINK(*slist, sp, link);
UNLOCK(&sessionlock);
if (sp->session != CK_INVALID_HANDLE) {
rv = pkcs_C_CloseSession(sp->session);
@ -408,7 +409,6 @@ free_session_list(pk11_sessionlist_t *slist) {
ret = DST_R_CRYPTOFAILURE;
}
LOCK(&sessionlock);
ISC_LIST_UNLINK(*slist, sp, link);
pk11_mem_put(sp, sizeof(*sp));
}
UNLOCK(&sessionlock);