From 9d9984a187088838c197f00ae3887d586fbb1ebc Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Mon, 24 Aug 2015 10:49:28 +0000 Subject: [PATCH] - Fix deadlock for local data add and zone add when unbound-control list_local_data printout is interrupted. git-svn-id: file:///svn/unbound/trunk@3476 be551aaa-1e26-0410-a405-d3ace91eadb9 --- daemon/remote.c | 10 ++++++++-- doc/Changelog | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 300948b32..19975e6c3 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2283,11 +2283,17 @@ do_list_local_data(SSL* ssl, struct worker* worker) for(i=0; icount + d->rrsig_count; i++) { if(!packed_rr_to_string(p->rrset, i, 0, s, slen)) { - if(!ssl_printf(ssl, "BADRR\n")) + if(!ssl_printf(ssl, "BADRR\n")) { + lock_rw_unlock(&z->lock); + lock_rw_unlock(&zones->lock); return; + } } - if(!ssl_printf(ssl, "%s\n", s)) + if(!ssl_printf(ssl, "%s\n", s)) { + lock_rw_unlock(&z->lock); + lock_rw_unlock(&zones->lock); return; + } } } } diff --git a/doc/Changelog b/doc/Changelog index 35f67c113..f8cf49372 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +24 August 2015: Wouter + - Fix deadlock for local data add and zone add when unbound-control + list_local_data printout is interrupted. + 13 August 2015: Wouter - 5011 implementation does not insist on all algorithms, when harden-algo-downgrade is turned off. -- 2.47.2