From 967e9afa65ac427425f91ac70231b074559941ce Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Tue, 31 Mar 2020 05:07:48 +0000 Subject: [PATCH] ikev2: fix crash during peer live check Fix crash when peer tries to build INFO req before key exchange which results using NULL key pointers for crypto operations. Type: fix Change-Id: I20aaf1ce769e4bfb45235047c2dd38307b4e0b59 Signed-off-by: Filip Tehlar --- src/plugins/ikev2/ikev2.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/ikev2/ikev2.c b/src/plugins/ikev2/ikev2.c index f288d4fcbec..fc4a87d80fd 100644 --- a/src/plugins/ikev2/ikev2.c +++ b/src/plugins/ikev2/ikev2.c @@ -2595,7 +2595,11 @@ ikev2_node_fn (vlib_main_t * vm, } } } - len = ikev2_generate_message (sa0, ike0, 0); + if (!(ike0->flags & IKEV2_HDR_FLAG_RESPONSE)) + { + ike0->flags |= IKEV2_HDR_FLAG_RESPONSE; + len = ikev2_generate_message (sa0, ike0, 0); + } } } else if (ike0->exchange == IKEV2_EXCHANGE_CREATE_CHILD_SA) @@ -3956,6 +3960,9 @@ ikev2_mngr_process_responder_sas (ikev2_sa_t * sa) ikev2_main_t *km = &ikev2_main; vlib_main_t *vm = km->vlib_main; + if (!sa->sk_ai || !sa->sk_ar) + return 0; + if (sa->liveness_retries > IKEV2_LIVENESS_RETRIES) return 1; -- 2.16.6