commit 967e9afa65ac427425f91ac70231b074559941ce
author Filip Tehlar <ftehlar@cisco.com> Tue Mar 31 05:07:48 2020 +0000
committer Neale Ranns <nranns@cisco.com> Tue Mar 31 15:09:54 2020 +0000
tree 57a5ab7665067441f3704fe8fe27f23b9c75f392
parent e4e8c6b082bea8a80003024b24f1d002cbc0fcb1

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 <ftehlar@cisco.com>

src/plugins/ikev2/ikev2.c

diff --git a/src/plugins/ikev2/ikev2.c b/src/plugins/ikev2/ikev2.c
index f288d4f..fc4a87d 100644
--- a/src/plugins/ikev2/ikev2.c
+++ b/src/plugins/ikev2/ikev2.c
@@ -2595,7 +2595,11 @@
 			    }
 			}
 		    }
-		  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_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;