From: Benoît Ganne <bganne@cisco.com>
Date: Fri, 27 Sep 2019 16:08:22 +0000 (+0200)
Subject: bonding: fix non-null-terminated C-string
X-Git-Tag: v20.05-rc0~746
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=5c828bc1f24fb5222d6bb634d8e5228ed8b138f0;p=vpp.git

bonding: fix non-null-terminated C-string

Type: fix

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

diff --git a/src/vnet/bonding/cli.c b/src/vnet/bonding/cli.c
index 2acc670a33d..604cb80c936 100644
--- a/src/vnet/bonding/cli.c
+++ b/src/vnet/bonding/cli.c
@@ -197,7 +197,9 @@ bond_dump_ifs (bond_interface_details_t ** out_bondifs)
     hi = vnet_get_hw_interface (vnm, bif->hw_if_index);
     clib_memcpy(bondif->interface_name, hi->name,
                 MIN (ARRAY_LEN (bondif->interface_name) - 1,
-                     strlen ((const char *) hi->name)));
+                     vec_len ((const char *) hi->name)));
+    /* enforce by memset() above */
+    ASSERT(0 == bondif->interface_name[ARRAY_LEN (bondif->interface_name) - 1]);
     bondif->mode = bif->mode;
     bondif->lb = bif->lb;
     bondif->numa_only = bif->numa_only;
@@ -239,7 +241,11 @@ bond_dump_slave_ifs (slave_interface_details_t ** out_slaveifs,
 	hi = vnet_get_hw_interface (vnm, sw->hw_if_index);
 	clib_memcpy (slaveif->interface_name, hi->name,
 		     MIN (ARRAY_LEN (slaveif->interface_name) - 1,
-			  strlen ((const char *) hi->name)));
+			  vec_len ((const char *) hi->name)));
+	/* enforce by memset() above */
+	ASSERT (0 ==
+		slaveif->interface_name[ARRAY_LEN (slaveif->interface_name) -
+					1]);
 	slaveif->sw_if_index = sif->sw_if_index;
 	slaveif->is_passive = sif->is_passive;
 	slaveif->is_long_timeout = sif->is_long_timeout;