denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memleak during Quick Mode in case no SPI can be allocated from kernel.

Browse Source
This commit is contained in:
Tobias Brunner
2012-05-24 15:32:27 +02:00
parent 624bb24d12
commit 00e11bcefd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/quick_mode.c
+8 -8
View File
@@ -629,7 +629,12 @@ METHOD(task_t, build_i, status_t,
this->ike_sa->get_other_host(this->ike_sa), this->ike_sa->get_other_host(this->ike_sa),
this->config, this->reqid, this->udp); this->config, this->reqid, this->udp);
list = this->config->get_proposals(this->config, FALSE); this->mode = this->config->get_mode(this->config);
if (this->udp && this->mode == MODE_TRANSPORT)
{
/* TODO-IKEv1: disable NAT-T for TRANSPORT mode by default? */
add_nat_oa_payloads(this, message);
}
this->spi_i = this->child_sa->alloc_spi(this->child_sa, PROTO_ESP); this->spi_i = this->child_sa->alloc_spi(this->child_sa, PROTO_ESP);
if (!this->spi_i) if (!this->spi_i)
@@ -637,6 +642,8 @@ METHOD(task_t, build_i, status_t,
DBG1(DBG_IKE, "allocating SPI from kernel failed"); DBG1(DBG_IKE, "allocating SPI from kernel failed");
return FAILED; return FAILED;
} }
list = this->config->get_proposals(this->config, FALSE);
enumerator = list->create_enumerator(list); enumerator = list->create_enumerator(list);
while (enumerator->enumerate(enumerator, &proposal)) while (enumerator->enumerate(enumerator, &proposal))
{ {
@@ -644,13 +651,6 @@ METHOD(task_t, build_i, status_t,
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->mode = this->config->get_mode(this->config);
if (this->udp && this->mode == MODE_TRANSPORT)
{
/* TODO-IKEv1: disable NAT-T for TRANSPORT mode by default? */
add_nat_oa_payloads(this, message);
}
get_lifetimes(this); get_lifetimes(this);
sa_payload = sa_payload_create_from_proposals_v1(list, sa_payload = sa_payload_create_from_proposals_v1(list,
this->lifetime, this->lifebytes, AUTH_NONE, this->lifetime, this->lifebytes, AUTH_NONE,