wireguard: fix dereferences null pointer

[vpp.git] / src / plugins / wireguard / wireguard_noise.h

diff --git a/src/plugins/wireguard/wireguard_noise.h b/src/plugins/wireguard/wireguard_noise.h
index b436120..e95211b 100644 (file)
--- a/src/plugins/wireguard/wireguard_noise.h
+++ b/src/plugins/wireguard/wireguard_noise.h
@@ -199,22 +199,22 @@ noise_remote_encrypt (vlib_main_t * vm, noise_remote_t *,
 static_always_inline noise_keypair_t *
 wg_get_active_keypair (noise_remote_t *r, uint32_t r_idx)
 {
-  if (r->r_current != NULL)
+  if (r->r_current != NULL && r->r_current->kp_local_index == r_idx)
     {
-      if (r->r_current->kp_local_index == r_idx)
-       return r->r_current;
+      return r->r_current;
     }
-  if (r->r_previous != NULL)
+  else if (r->r_previous != NULL && r->r_previous->kp_local_index == r_idx)
     {
-      if (r->r_previous->kp_local_index == r_idx)
-       return r->r_previous;
+      return r->r_previous;
     }
-  if (r->r_next != NULL)
+  else if (r->r_next != NULL && r->r_next->kp_local_index == r_idx)
     {
-      if (r->r_next->kp_local_index == r_idx)
-       return r->r_next;
+      return r->r_next;
+    }
+  else
+    {
+      return NULL;
     }
-  return NULL;
 }
 
 inline bool