From: Benoît Ganne <bganne@cisco.com>
Date: Thu, 7 Oct 2021 15:37:07 +0000 (+0200)
Subject: ipsec: fix protect update log if nexthop is NULL
X-Git-Tag: v22.06-rc0~429
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=ac55a722d67c7354f2ab877ff79309027f7ac3ca;p=vpp.git

ipsec: fix protect update log if nexthop is NULL

If logging is on, it will try to print the address nh. Make sure it is
not NULL.

Type: fix

Change-Id: I81c0295865901406d86e0d822a103b4d5adffe47
Signed-off-by: Benoît Ganne <bganne@cisco.com>
---

diff --git a/src/vnet/ipsec/ipsec_tun.c b/src/vnet/ipsec/ipsec_tun.c
index 58f9efefdc4..1a9a25783ae 100644
--- a/src/vnet/ipsec/ipsec_tun.c
+++ b/src/vnet/ipsec/ipsec_tun.c
@@ -569,6 +569,9 @@ ipsec_tun_protect_update (u32 sw_if_index,
   ipsec_main_t *im;
   int rv;
 
+  if (NULL == nh)
+    nh = &IP_ADDR_ALL_0;
+
   ITP_DBG2 ("update: %U/%U",
 	    format_vnet_sw_if_index_name, vnet_get_main (), sw_if_index,
 	    format_ip_address, nh);
@@ -581,8 +584,6 @@ ipsec_tun_protect_update (u32 sw_if_index,
 
   rv = 0;
   im = &ipsec_main;
-  if (NULL == nh)
-    nh = &IP_ADDR_ALL_0;
   itpi = ipsec_tun_protect_find (sw_if_index, nh);
 
   vec_foreach_index (ii, sas_in)