commit 4c6b1b6da5d884c80363aeba75bc318a06e29031
author Filip Tehlar <ftehlar@cisco.com> Sat Nov 30 20:49:40 2019 +0000
committer Damjan Marion <dmarion@me.com> Thu Dec 12 23:01:10 2019 +0000
tree ad9ea0a501983a381a981abfd381b1e22da22ce9
parent 64cf459bc9353935a72c3e37892b7b7444029795

ikev2: fix crash during SA rekey

Type: fix

Change-Id: Ib00ab9b2f28c0f4d85e96bf95697f61b8e415f37
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>

src/vnet/ipip/ipip.c

diff --git a/src/vnet/ipip/ipip.c b/src/vnet/ipip/ipip.c
index fc71b5b..d68e815 100644
--- a/src/vnet/ipip/ipip.c
+++ b/src/vnet/ipip/ipip.c
@@ -430,7 +430,11 @@
   };
   t = ipip_tunnel_db_find (&key);
   if (t)
-    return VNET_API_ERROR_IF_ALREADY_EXISTS;
+    {
+      if (sw_if_indexp)
+	sw_if_indexp[0] = t->sw_if_index;
+      return VNET_API_ERROR_IF_ALREADY_EXISTS;
+    }
 
   pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES);
   clib_memset (t, 0, sizeof (*t));