aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoît Ganne <bganne@cisco.com>2019-09-27 18:08:22 +0200
committerJohn Lo <loj@cisco.com>2019-09-30 17:03:02 +0000
commit5c828bc1f24fb5222d6bb634d8e5228ed8b138f0 (patch)
tree130f3fd039f42af12d9c949f96118793ef0286c9
parent46b91ebb5c350ceeccec97d8e09524f708512342 (diff)
bonding: fix non-null-terminated C-string
Type: fix Change-Id: Ibb7ba878b049b8b18e890c43fdd6324cb88d63b8 Signed-off-by: Benoît Ganne <bganne@cisco.com>
-rw-r--r--src/vnet/bonding/cli.c10
1 files changed, 8 insertions, 2 deletions
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;