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

child-rekey: Don't migrate child-create task if we already are deleting

Browse Source 
If we are already deleting the old/redundant CHILD_SA, we must not
migrate the child-create task as that would destroy the new CHILD_SA we
already moved to the IKE_SA.

Fixes #3644.
This commit is contained in:
Tobias Brunner
2020-12-03 11:06:23 +01:00
parent 7d2d94f3e1
commit 25ec2d04aa
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/child_rekey.c
+5 -4
View File
@@ -573,14 +573,15 @@ METHOD(child_rekey_t, collide, void,
METHOD(task_t, migrate, void, METHOD(task_t, migrate, void,
private_child_rekey_t *this, ike_sa_t *ike_sa) private_child_rekey_t *this, ike_sa_t *ike_sa)
{ {
if (this->child_create) /* only migrate the currently active task */
{
this->child_create->task.migrate(&this->child_create->task, ike_sa);
}
if (this->child_delete) if (this->child_delete)
{ {
this->child_delete->task.migrate(&this->child_delete->task, ike_sa); this->child_delete->task.migrate(&this->child_delete->task, ike_sa);
} }
else if (this->child_create)
{
this->child_create->task.migrate(&this->child_create->task, ike_sa);
}
DESTROY_IF(this->collision); DESTROY_IF(this->collision);
this->ike_sa = ike_sa; this->ike_sa = ike_sa;