From: Adrian-Ken Rueegsegger <ken@codelabs.ch>
Date: Tue, 5 Sep 2017 13:56:12 +0000 (+0200)
Subject: charon-tkm: Reset ESA on child SA create failure
X-Git-Tag: 5.6.1dr3~23^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc08e6af8a92816b5f1ae2805c22cc82c3a7be4f;p=thirdparty%2Fstrongswan.git

charon-tkm: Reset ESA on child SA create failure

Since we are also releasing the ESA ID we have to make sure that the ESA
context is reset and in a clean state in order for it to be actually
reusable.
---

diff --git a/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c b/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
index 87b516d439..48dd40aa51 100644
--- a/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
+++ b/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
@@ -199,6 +199,7 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
 	return SUCCESS;
 
 failure:
+	ike_esa_reset(esa_id);
 	tkm->sad->remove(tkm->sad, esa_id);
 sad_failure:
 	tkm->idmgr->release_id(tkm->idmgr, TKM_CTX_ESA, esa_id);