Avoid a deadlock when installing a trap policy failed

diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
index 69b23e1dfa5a3a514afdee19fc7aabdeeb5a5c4b..6c0ae19c703d1975327b2921a5a2b615f270c7f7 100644 (file)
--- a/src/libcharon/sa/trap_manager.c
+++ b/src/libcharon/sa/trap_manager.c
@@ -170,8 +170,8 @@ METHOD(trap_manager_t, install, u_int32_t,
        if (status != SUCCESS)
        {
                DBG1(DBG_CFG, "installing trap failed");
-               child_sa->destroy(child_sa);
                reqid = 0;
+               /* hold off destroying the CHILD_SA until we released the lock */
        }
        else
        {
@@ -184,6 +184,10 @@ METHOD(trap_manager_t, install, u_int32_t,
        }
        this->lock->unlock(this->lock);
 
+       if (status != SUCCESS)
+       {
+               child_sa->destroy(child_sa);
+       }
        if (found)
        {
                destroy_entry(found);