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

vici: Limit start action undoing to IKE_SAs using the base peer config name

Browse Source 
If two peer configs use the same child config names, potentailly delete
the wrong CHILD_SA. Check the peer config name as well to avoid that.
This commit is contained in:
Martin Willi
2015-12-07 10:05:07 +01:00
parent 23b1f71372
commit b26ba1b4a4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/vici/vici_config.c
+7 -3
View File
@@ -1613,7 +1613,7 @@ static void run_start_action(private_vici_config_t *this, peer_cfg_t *peer_cfg,
/** /**
* Undo start actions associated to a child config * Undo start actions associated to a child config
*/ */
static void clear_start_action(private_vici_config_t *this, static void clear_start_action(private_vici_config_t *this, char *peer_name,
child_cfg_t *child_cfg) child_cfg_t *child_cfg)
{ {
enumerator_t *enumerator, *children; enumerator_t *enumerator, *children;
@@ -1631,6 +1631,10 @@ static void clear_start_action(private_vici_config_t *this,
charon->controller, TRUE); charon->controller, TRUE);
while (enumerator->enumerate(enumerator, &ike_sa)) while (enumerator->enumerate(enumerator, &ike_sa))
{ {
if (!streq(ike_sa->get_name(ike_sa), peer_name))
{
continue;
}
others = id = 0; others = id = 0;
children = ike_sa->create_child_sa_enumerator(ike_sa); children = ike_sa->create_child_sa_enumerator(ike_sa);
while (children->enumerate(children, &child_sa)) while (children->enumerate(children, &child_sa))
@@ -1753,7 +1757,7 @@ static void clear_start_actions(private_vici_config_t *this,
enumerator = peer_cfg->create_child_cfg_enumerator(peer_cfg); enumerator = peer_cfg->create_child_cfg_enumerator(peer_cfg);
while (enumerator->enumerate(enumerator, &child_cfg)) while (enumerator->enumerate(enumerator, &child_cfg))
{ {
clear_start_action(this, child_cfg); clear_start_action(this, peer_cfg->get_name(peer_cfg), child_cfg);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
} }
@@ -1771,7 +1775,7 @@ static void replace_children(private_vici_config_t *this,
while (enumerator->enumerate(enumerator, &child)) while (enumerator->enumerate(enumerator, &child))
{ {
to->remove_child_cfg(to, enumerator); to->remove_child_cfg(to, enumerator);
clear_start_action(this, child); clear_start_action(this, to->get_name(to), child);
child->destroy(child); child->destroy(child);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);