X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip4_punt_drop.c;h=5f40e14754ab1dd3ec93025a1e6905b7f79de675;hb=4112e389ea934463fd2160c8f24edaf11bc931b0;hp=ceb1bb8f2514305135802886590bad0b8aad44c8;hpb=561af9b441c7392cf391dd46399b0b16b876a08a;p=vpp.git

diff --git a/src/vnet/ip/ip4_punt_drop.c b/src/vnet/ip/ip4_punt_drop.c
index ceb1bb8f251..5f40e14754a 100644
--- a/src/vnet/ip/ip4_punt_drop.c
+++ b/src/vnet/ip/ip4_punt_drop.c
@@ -115,6 +115,7 @@ format_ip_punt_redirect_trace (u8 * s, va_list * args)
 ip_punt_redirect_t ip4_punt_redirect_cfg = {
   .any_rx_sw_if_index = {
     .tx_sw_if_index = ~0,
+	.adj_index = ADJ_INDEX_INVALID,
   },
 };
 /* *INDENT-ON* */
@@ -309,6 +310,7 @@ VLIB_CLI_COMMAND (ip4_punt_policer_command, static) =
  */
 ip_punt_redirect_rx_t uninit_rx_redirect = {
   .tx_sw_if_index = ~0,
+  .adj_index = ADJ_INDEX_INVALID,
 };
 
 void
@@ -351,6 +353,9 @@ ip_punt_redirect_del (ip_punt_redirect_t * cfg, u32 rx_sw_if_index)
       old = &cfg->redirect_by_rx_sw_if_index[rx_sw_if_index];
     }
 
+  if ((old == NULL) || (old->adj_index == ADJ_INDEX_INVALID))
+    return;
+
   adj_unlock (old->adj_index);
   *old = uninit_rx_redirect;
 }