From e91157a4b64e752e21fcd4b95f3f56d85eb519cc Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 7 Jun 2012 14:59:20 +0200 Subject: [PATCH] Fix SIGSEGV if kernel install fails during Quick Mode as responder. --- src/libcharon/sa/ikev1/tasks/quick_mode.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c index 663f2c063..9251e1a35 100644 --- a/src/libcharon/sa/ikev1/tasks/quick_mode.c +++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c @@ -964,11 +964,15 @@ METHOD(task_t, process_r, status_t, } if (!install(this)) { - this->ike_sa->flush_queue(this->ike_sa, TASK_QUEUE_PASSIVE); - this->ike_sa->queue_task(this->ike_sa, - (task_t*)quick_delete_create(this->ike_sa, + ike_sa_t *ike_sa = this->ike_sa; + task_t *task; + + task = (task_t*)quick_delete_create(this->ike_sa, this->proposal->get_protocol(this->proposal), - this->spi_i, TRUE, TRUE)); + this->spi_i, TRUE, TRUE); + /* flush_queue() destroys the current task */ + ike_sa->flush_queue(ike_sa, TASK_QUEUE_PASSIVE); + ike_sa->queue_task(ike_sa, task); return ALREADY_DONE; } return SUCCESS; -- 2.39.2