From 1d528cfb8d6f0ee411b545ad07ace44876afe2ff Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 6 Nov 2015 09:18:44 +0100 Subject: [PATCH] ike-sa-manager: Signal waiting threads after check out/in for uniqueness check Fixes 758b1caa0e75 ("ikev1: Prevent deadlock when checking for duplicate IKEv1 SAs") --- src/libcharon/sa/ike_sa_manager.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c index 9ebdae7f6..4adf22c15 100644 --- a/src/libcharon/sa/ike_sa_manager.c +++ b/src/libcharon/sa/ike_sa_manager.c @@ -1646,6 +1646,9 @@ METHOD(ike_sa_manager_t, checkin, void, * need for a lookup via get_entry_by... */ lock_single_segment(this, segment); entry->checked_out = FALSE; + /* We already signaled waiting threads above, we have to do that + * again after checking the SA out and back in again. */ + entry->condvar->signal(entry->condvar); } }