From: Dave Barach <dave@barachs.net>
Date: Thu, 23 Apr 2020 20:56:15 +0000 (-0400)
Subject: nat: add/del ed_ext_ports only if the table is instantiated
X-Git-Tag: v20.09-rc0~149
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=a90ba644b2c5463b89a91d019b3c22780242acc3

nat: add/del ed_ext_ports only if the table is instantiated

Add a suitable ASSERT in the bihash template in case this happens again.

Type: fix

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: Ib370d4238f6bae2995bc30fd17fad5c41053c3d1
---

diff --git a/src/plugins/nat/nat.c b/src/plugins/nat/nat.c
index 8ba276bc9b4..30238f9d62f 100755
--- a/src/plugins/nat/nat.c
+++ b/src/plugins/nat/nat.c
@@ -330,8 +330,9 @@ nat_free_session_data (snat_main_t * sm, snat_session_t * s, u32 thread_index,
   bihash_key.k.src_address = s->out2in.addr.as_u32;
   bihash_key.k.src_port = s->out2in.port;
   bihash_key.k.protocol = s->out2in.protocol;
-  clib_bihash_add_del_16_8 (&sm->ed_ext_ports, &bihash_key.kv,
-			    0 /* is_add */ );
+  if (sm->ed_ext_ports.instantiated)
+    clib_bihash_add_del_16_8 (&sm->ed_ext_ports, &bihash_key.kv,
+			      0 /* is_add */ );
 
   snat_free_outside_address_and_port (sm->addresses, thread_index,
 				      &s->out2in);
@@ -465,8 +466,9 @@ nat44_free_session_data (snat_main_t * sm, snat_session_t * s,
   bihash_key.k.src_address = s->out2in.addr.as_u32;
   bihash_key.k.src_port = s->out2in.port;
   bihash_key.k.protocol = s->out2in.protocol;
-  clib_bihash_add_del_16_8 (&sm->ed_ext_ports, &bihash_key.kv,
-			    0 /* is_add */ );
+  if (sm->ed_ext_ports.instantiated)
+    clib_bihash_add_del_16_8 (&sm->ed_ext_ports, &bihash_key.kv,
+			      0 /* is_add */ );
 
   // should be called for every dynamic session
   snat_free_outside_address_and_port (sm->addresses, thread_index,
diff --git a/src/vppinfra/bihash_template.c b/src/vppinfra/bihash_template.c
index f7d88073418..47e9bd0113d 100644
--- a/src/vppinfra/bihash_template.c
+++ b/src/vppinfra/bihash_template.c
@@ -568,6 +568,9 @@ static_always_inline int BV (clib_bihash_add_del_inline_with_hash)
 	BV (clib_bihash_instantiate) (h);
       BV (clib_bihash_alloc_unlock) (h);
     }
+#else
+  /* Debug image: make sure the table has been instantiated */
+  ASSERT (h->instantiated != 0);
 #endif
 
   b = BV (clib_bihash_get_bucket) (h, hash);