From: Matus Fabian <matfabia@cisco.com>
Date: Tue, 27 Mar 2018 08:07:25 +0000 (-0700)
Subject: NAT44: fix nat44_user_session_dump and nat44_del_session crash with one worker (VPP... 
X-Git-Tag: v18.04-rc1~37
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=4888b50bb4625c4de029958b9d1f41a626ede33c

NAT44: fix nat44_user_session_dump and nat44_del_session crash with one worker (VPP-1213)

Change-Id: I8e0c7ed2ff462b9ab59c233f56be262ec03c29ff
Signed-off-by: Matus Fabian <matfabia@cisco.com>
---

diff --git a/src/plugins/nat/nat.c b/src/plugins/nat/nat.c
index feeee759e1b..8f4050ee2e7 100644
--- a/src/plugins/nat/nat.c
+++ b/src/plugins/nat/nat.c
@@ -2862,7 +2862,7 @@ nat44_del_session (snat_main_t *sm, ip4_address_t *addr, u16 port,
   snat_user_t *u;
 
   ip.dst_address.as_u32 = ip.src_address.as_u32 = addr->as_u32;
-  if (sm->num_workers)
+  if (sm->num_workers > 1)
     tsm =
       vec_elt_at_index (sm->per_thread_data,
 			sm->worker_in2out_cb (&ip, fib_index));
diff --git a/src/plugins/nat/nat_api.c b/src/plugins/nat/nat_api.c
index 433840e2b89..e27af8ac88e 100644
--- a/src/plugins/nat/nat_api.c
+++ b/src/plugins/nat/nat_api.c
@@ -1190,7 +1190,7 @@ vl_api_nat44_user_session_dump_t_handler (vl_api_nat44_user_session_dump_t *
   ip.src_address.as_u32 = ukey.addr.as_u32;
   ukey.fib_index = fib_table_find (FIB_PROTOCOL_IP4, ntohl (mp->vrf_id));
   key.key = ukey.as_u64;
-  if (sm->num_workers)
+  if (sm->num_workers > 1)
     tsm =
       vec_elt_at_index (sm->per_thread_data,
 			sm->worker_in2out_cb (&ip, ukey.fib_index));