ikev2: fix crash during peer live check 63/26263/3
authorFilip Tehlar <ftehlar@cisco.com>
Tue, 31 Mar 2020 05:07:48 +0000 (05:07 +0000)
committerNeale Ranns <nranns@cisco.com>
Tue, 31 Mar 2020 15:09:54 +0000 (15:09 +0000)
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 <ftehlar@cisco.com>
src/plugins/ikev2/ikev2.c

index f288d4f..fc4a87d 100644 (file)
@@ -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;