c11 safe string handling support

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

14 files changed, 58 insertions, 58 deletions

diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c
index 86865099532..cf5d252e347 100644
--- a/src/vpp/api/api.c
+++ b/src/vpp/api/api.c
@@ -292,7 +292,7 @@ vl_api_show_threads_t_handler (vl_api_show_threads_t * mp)
     return;
 
   rmp = vl_msg_api_alloc (msg_size);
-  memset (rmp, 0, msg_size);
+  clib_memset (rmp, 0, msg_size);
   rmp->_vl_msg_id = htons (VL_API_SHOW_THREADS_REPLY);
   rmp->context = mp->context;
   rmp->count = htonl (count);
diff --git a/src/vpp/api/api_main.c b/src/vpp/api/api_main.c
index 8f33f042c5d..7770880d01c 100644
--- a/src/vpp/api/api_main.c
+++ b/src/vpp/api/api_main.c
@@ -92,7 +92,7 @@ maybe_register_api_client (vat_main_t * vam)
   *regpp = clib_mem_alloc (sizeof (vl_api_registration_t));
 
   regp = *regpp;
-  memset (regp, 0, sizeof (*regp));
+  clib_memset (regp, 0, sizeof (*regp));
   regp->registration_type = REGISTRATION_TYPE_SHMEM;
   regp->vl_api_registration_pool_index = regpp - am->vl_clients;
   regp->vlib_rp = svm;
diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index 8fd4a8deeb1..727032fb1bf 100644
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -536,7 +536,7 @@ static void *vl_api_tap_connect_t_print
   u8 *s;
   u8 null_mac[6];
 
-  memset (null_mac, 0, sizeof (null_mac));
+  clib_memset (null_mac, 0, sizeof (null_mac));
 
   s = format (0, "SCRIPT: tap_connect ");
   s = format (s, "tapname %s ", mp->tap_name);
@@ -561,7 +561,7 @@ static void *vl_api_tap_modify_t_print
   u8 *s;
   u8 null_mac[6];
 
-  memset (null_mac, 0, sizeof (null_mac));
+  clib_memset (null_mac, 0, sizeof (null_mac));
 
   s = format (0, "SCRIPT: tap_modify ");
   s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
@@ -602,7 +602,7 @@ static void *vl_api_tap_create_v2_t_print
   u8 *s;
   u8 null_mac[6];
 
-  memset (null_mac, 0, sizeof (null_mac));
+  clib_memset (null_mac, 0, sizeof (null_mac));
 
   s = format (0, "SCRIPT: tap_create_v2 ");
   s = format (s, "id %u ", ntohl (mp->id));
@@ -662,7 +662,7 @@ static void *vl_api_bond_create_t_print
   u8 *s;
   u8 null_mac[6];
 
-  memset (null_mac, 0, sizeof (null_mac));
+  clib_memset (null_mac, 0, sizeof (null_mac));
 
   s = format (0, "SCRIPT: bond_create ");
   if (memcmp (mp->mac_address, null_mac, 6))
@@ -1036,7 +1036,7 @@ static void *vl_api_ip_neighbor_add_del_t_print
   u8 *s;
   u8 null_mac[6];
 
-  memset (null_mac, 0, sizeof (null_mac));
+  clib_memset (null_mac, 0, sizeof (null_mac));
 
   s = format (0, "SCRIPT: ip_neighbor_add_del ");
 
@@ -3601,7 +3601,7 @@ static void *vl_api_sw_interface_set_lldp_t_print
   u8 *s;
   u8 null_data[256];
 
-  memset (null_data, 0, sizeof (null_data));
+  clib_memset (null_data, 0, sizeof (null_data));
 
   s = format (0, "SCRIPT: sw_interface_set_lldp ");
   s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
diff --git a/src/vpp/api/gmon.c b/src/vpp/api/gmon.c
index 6b33373070d..f665a09c62a 100644
--- a/src/vpp/api/gmon.c
+++ b/src/vpp/api/gmon.c
@@ -172,7 +172,7 @@ gmon_init (vlib_main_t * vm)
 
   gm->vlib_main = vm;
 
-  memset (ma, 0, sizeof (*ma));
+  clib_memset (ma, 0, sizeof (*ma));
   ma->root_path = am->root_path;
   ma->uid = am->api_uid;
   ma->gid = am->api_gid;
diff --git a/src/vpp/api/json_format.c b/src/vpp/api/json_format.c
index 63454b87ac7..e001be04601 100644
--- a/src/vpp/api/json_format.c
+++ b/src/vpp/api/json_format.c
@@ -245,7 +245,7 @@ void
 vat_json_print (FILE * ofp, vat_json_node_t * node)
 {
   vat_print_ctx_t ctx;
-  memset (&ctx, 0, sizeof ctx);
+  clib_memset (&ctx, 0, sizeof ctx);
   ctx.indent = 0;
   ctx.ofp = ofp;
   fformat (ofp, "\n");
diff --git a/src/vpp/api/plugin.c b/src/vpp/api/plugin.c
index 1506a82ddca..51f3461f1ec 100644
--- a/src/vpp/api/plugin.c
+++ b/src/vpp/api/plugin.c
@@ -160,7 +160,7 @@ vat_load_new_plugins (plugin_main_t * pm)
 		  _vec_len (pm->plugin_info) = vec_len (pm->plugin_info) - 1;
 		  continue;
 		}
-	      memset (pi, 0, sizeof (*pi));
+	      clib_memset (pi, 0, sizeof (*pi));
 	      hash_set_mem (pm->plugin_by_name_hash, plugin_name,
 			    pi - pm->plugin_info);
 	    }
diff --git a/src/vpp/api/summary_stats_client.c b/src/vpp/api/summary_stats_client.c
index 8c8e9bbe44f..60a0cd921b5 100644
--- a/src/vpp/api/summary_stats_client.c
+++ b/src/vpp/api/summary_stats_client.c
@@ -266,7 +266,7 @@ main (int argc, char **argv)
       exit (1);
     }
 
-  memset (&tm->send_data_addr, 0, sizeof (tm->send_data_addr));
+  clib_memset (&tm->send_data_addr, 0, sizeof (tm->send_data_addr));
   tm->send_data_addr.sin_family = AF_INET;
   tm->send_data_addr.sin_addr.s_addr = collector_ip.as_u32;
   tm->send_data_addr.sin_port = htons (collector_port);
@@ -281,7 +281,7 @@ main (int argc, char **argv)
 	break;
       /* Poll for stats */
       mp = vl_msg_api_alloc (sizeof (*mp));
-      memset (mp, 0, sizeof (*mp));
+      clib_memset (mp, 0, sizeof (*mp));
       mp->_vl_msg_id = ntohs (VL_API_VNET_GET_SUMMARY_STATS);
       mp->client_index = tm->my_client_index;
       vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
diff --git a/src/vpp/api/test_client.c b/src/vpp/api/test_client.c
index e36fdbfc22c..1239732ec8e 100644
--- a/src/vpp/api/test_client.c
+++ b/src/vpp/api/test_client.c
@@ -656,7 +656,7 @@ link_up_down_enable_disable (test_main_t * tm, int enable)
 
   /* Request admin / link up down messages */
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_WANT_INTERFACE_EVENTS);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -672,7 +672,7 @@ stats_enable_disable (test_main_t * tm, int enable)
   vl_api_want_stats_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_WANT_STATS);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -688,7 +688,7 @@ oam_events_enable_disable (test_main_t * tm, int enable)
   vl_api_want_oam_events_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_WANT_OAM_EVENTS);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -705,7 +705,7 @@ oam_add_del (test_main_t * tm, int is_add)
   ip4_address_t tmp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_OAM_ADD_DEL);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -727,7 +727,7 @@ dump (test_main_t * tm)
   vl_api_sw_interface_dump_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_DUMP);
   mp->client_index = tm->my_client_index;
   mp->name_filter_valid = 1;
@@ -743,7 +743,7 @@ add_del_ip4_route (test_main_t * tm, int enable_disable)
   u32 tmp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_IP_ADD_DEL_ROUTE);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -772,7 +772,7 @@ add_del_ip6_route (test_main_t * tm, int enable_disable)
   u64 tmp[2];
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_IP_ADD_DEL_ROUTE);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -804,7 +804,7 @@ add_del_interface_address (test_main_t * tm, int enable_disable)
   u32 tmp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -825,7 +825,7 @@ add_del_v6_interface_address (test_main_t * tm, int enable_disable)
   u64 tmp[2];
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -849,7 +849,7 @@ del_all_interface_addresses (test_main_t * tm)
   vl_api_sw_interface_add_del_address_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -865,7 +865,7 @@ set_interface_table (test_main_t * tm, int is_ipv6, u32 vrf_id)
   vl_api_sw_interface_set_table_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_TABLE);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -882,7 +882,7 @@ connect_unix_tap (test_main_t * tm, char *name)
   vl_api_tap_connect_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_TAP_CONNECT);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -897,7 +897,7 @@ create_vlan_subif (test_main_t * tm, u32 vlan_id)
   vl_api_create_vlan_subif_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_CREATE_VLAN_SUBIF);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -914,7 +914,7 @@ add_del_proxy_arp (test_main_t * tm, int is_add)
   u32 tmp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_PROXY_ARP_ADD_DEL);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -937,7 +937,7 @@ proxy_arp_intfc_enable_disable (test_main_t * tm, int enable_disable)
   vl_api_proxy_arp_intfc_enable_disable_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_PROXY_ARP_INTFC_ENABLE_DISABLE);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -954,14 +954,14 @@ add_ip4_neighbor (test_main_t * tm, int add_del)
   u32 tmp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_IP_NEIGHBOR_ADD_DEL);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
   mp->sw_if_index = ntohl (6);
   mp->is_add = add_del;
 
-  memset (mp->mac_address, 0xbe, sizeof (mp->mac_address));
+  clib_memset (mp->mac_address, 0xbe, sizeof (mp->mac_address));
 
   tmp = ntohl (0x0101010a);
   clib_memcpy (mp->dst_address, &tmp, 4);
@@ -976,7 +976,7 @@ add_ip6_neighbor (test_main_t * tm, int add_del)
   u64 tmp[2];
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_IP_NEIGHBOR_ADD_DEL);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -984,7 +984,7 @@ add_ip6_neighbor (test_main_t * tm, int add_del)
   mp->is_add = add_del;
   mp->is_ipv6 = 1;
 
-  memset (mp->mac_address, 0xbe, sizeof (mp->mac_address));
+  clib_memset (mp->mac_address, 0xbe, sizeof (mp->mac_address));
 
   tmp[0] = clib_host_to_net_u64 (0xdb01000000000000ULL);
   tmp[1] = clib_host_to_net_u64 (0x11ULL);
@@ -1001,7 +1001,7 @@ reset_fib (test_main_t * tm, u8 is_ip6)
   vl_api_reset_fib_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_RESET_FIB);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -1017,7 +1017,7 @@ dhcpv6_set_vss (test_main_t * tm)
   vl_api_dhcp_proxy_set_vss_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_SET_VSS);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -1034,7 +1034,7 @@ dhcpv4_set_vss (test_main_t * tm)
   vl_api_dhcp_proxy_set_vss_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_SET_VSS);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -1058,7 +1058,7 @@ dhcp_set_proxy (test_main_t * tm, int ipv6)
   vl_api_dhcp_proxy_config_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_CONFIG);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -1095,7 +1095,7 @@ set_ip_flow_hash (test_main_t * tm, u8 is_ip6)
   vl_api_set_ip_flow_hash_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_SET_IP_FLOW_HASH);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -1113,7 +1113,7 @@ ip6nd_ra_config (test_main_t * tm, int is_no)
   vl_api_sw_interface_ip6nd_ra_config_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
 
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -1134,7 +1134,7 @@ ip6nd_ra_prefix (test_main_t * tm, int is_no)
   u64 tmp[2];
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
 
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -1164,7 +1164,7 @@ ip6_enable_disable (test_main_t * tm, int enable)
   vl_api_sw_interface_ip6_enable_disable_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
 
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -1181,7 +1181,7 @@ loop_create (test_main_t * tm)
   vl_api_create_loopback_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
 
   mp->_vl_msg_id = ntohs (VL_API_CREATE_LOOPBACK);
   mp->client_index = tm->my_client_index;
@@ -1196,7 +1196,7 @@ ip6_set_link_local_address (test_main_t * tm)
   u64 tmp[2];
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
 
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -1220,7 +1220,7 @@ set_flags (test_main_t * tm, int up_down)
   vl_api_sw_interface_set_flags_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
 
   mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_FLAGS);
   mp->client_index = tm->my_client_index;
@@ -1237,7 +1237,7 @@ l2_patch_add_del (test_main_t * tm, int is_add)
   vl_api_l2_patch_add_del_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_L2_PATCH_ADD_DEL);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -1254,7 +1254,7 @@ l2_xconnect (test_main_t * tm)
   vl_api_sw_interface_set_l2_xconnect_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_L2_XCONNECT);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
@@ -1271,7 +1271,7 @@ l2_bridge (test_main_t * tm)
   vl_api_sw_interface_set_l2_bridge_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_L2_BRIDGE);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
diff --git a/src/vpp/api/test_ha.c b/src/vpp/api/test_ha.c
index d88c4d4c1f4..b9fc428d192 100644
--- a/src/vpp/api/test_ha.c
+++ b/src/vpp/api/test_ha.c
@@ -113,7 +113,7 @@ ping (test_main_t * tm)
   vl_api_control_ping_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_CONTROL_PING);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
diff --git a/src/vpp/api/vpp_get_metrics.c b/src/vpp/api/vpp_get_metrics.c
index 3474133da3f..9241e6d70c5 100644
--- a/src/vpp/api/vpp_get_metrics.c
+++ b/src/vpp/api/vpp_get_metrics.c
@@ -69,7 +69,7 @@ setup_signal_handlers (void)
 
   for (i = 1; i < 32; i++)
     {
-      memset (&sa, 0, sizeof (sa));
+      clib_memset (&sa, 0, sizeof (sa));
       sa.sa_sigaction = (void *) unix_signal_handler;
       sa.sa_flags = SA_SIGINFO;
 
@@ -177,7 +177,7 @@ main (int argc, char **argv)
 
   setup_signal_handlers ();
 
-  memset (ma, 0, sizeof (*ma));
+  clib_memset (ma, 0, sizeof (*ma));
   ma->root_path = chroot_path;
   ma->uid = uid;
   ma->gid = gid;
diff --git a/src/vpp/app/vpp_prometheus_export.c b/src/vpp/app/vpp_prometheus_export.c
index b12ce6f30d2..e2fdd7150e5 100644
--- a/src/vpp/app/vpp_prometheus_export.c
+++ b/src/vpp/app/vpp_prometheus_export.c
@@ -200,7 +200,7 @@ start_listen (u16 port)
       return -1;
     }
 
-  memset (&serveraddr, 0, sizeof (serveraddr));
+  clib_memset (&serveraddr, 0, sizeof (serveraddr));
   serveraddr.sin6_family = AF_INET6;
   serveraddr.sin6_port = htons (port);
   serveraddr.sin6_addr = in6addr_any;
diff --git a/src/vpp/app/vppctl.c b/src/vpp/app/vppctl.c
index b7582c07c1c..31c9e43a770 100644
--- a/src/vpp/app/vppctl.c
+++ b/src/vpp/app/vppctl.c
@@ -180,7 +180,7 @@ main (int argc, char *argv[])
   if (is_interactive)
     {
       /* Capture terminal resize events */
-      memset (&sa, 0, sizeof (struct sigaction));
+      clib_memset (&sa, 0, sizeof (struct sigaction));
       sa.sa_handler = signal_handler_winch;
       if (sigaction (SIGWINCH, &sa, 0) < 0)
 	{
diff --git a/src/vpp/oam/oam.c b/src/vpp/oam/oam.c
index 1579f562a67..8cee64b9628 100644
--- a/src/vpp/oam/oam.c
+++ b/src/vpp/oam/oam.c
@@ -29,7 +29,7 @@ init_oam_packet_template (oam_main_t * om, oam_target_t * t)
   vec_validate (t->template, 0);
 
   h = t->template;
-  memset (h, 0, sizeof (*h));
+  clib_memset (h, 0, sizeof (*h));
 
   h->ip4.src_address.as_u32 = t->src_address.as_u32;
   h->ip4.dst_address.as_u32 = t->dst_address.as_u32;
@@ -83,7 +83,7 @@ vpe_oam_add_del_target (ip4_address_t * src_address,
 	return VNET_API_ERROR_INVALID_REGISTRATION;	/* already there... */
 
       pool_get (om->targets, t);
-      memset (t, 0, sizeof (*t));
+      clib_memset (t, 0, sizeof (*t));
       t->src_address.as_u32 = src_address->as_u32;
       t->dst_address.as_u32 = dst_address->as_u32;
       t->fib_id = fib_id;
diff --git a/src/vpp/stats/stats_to_be_deprecated.c b/src/vpp/stats/stats_to_be_deprecated.c
index 241bdd978df..70974271658 100644
--- a/src/vpp/stats/stats_to_be_deprecated.c
+++ b/src/vpp/stats/stats_to_be_deprecated.c
@@ -870,7 +870,7 @@ do_combined_per_interface_counters (stats_main_t * sm)
 	      continue;
 	    }
 	  mp = vl_msg_api_alloc_as_if_client (sizeof (*mp) + sizeof (*vp));
-	  memset (mp, 0, sizeof (*mp));
+	  clib_memset (mp, 0, sizeof (*mp));
 
 	  mp->_vl_msg_id =
 	    ntohs (VL_API_VNET_PER_INTERFACE_COMBINED_COUNTERS);
@@ -1070,7 +1070,7 @@ do_simple_per_interface_counters (stats_main_t * sm)
 	    }
 
 	  mp = vl_msg_api_alloc_as_if_client (sizeof (*mp) + sizeof (*vp));
-	  memset (mp, 0, sizeof (*mp));
+	  clib_memset (mp, 0, sizeof (*mp));
 	  mp->_vl_msg_id = ntohs (VL_API_VNET_PER_INTERFACE_SIMPLE_COUNTERS);
 
 	  /*
@@ -3046,8 +3046,8 @@ vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
   rmp->context = mp->context;
   rmp->retval = 0;
 
-  memset (total_pkts, 0, sizeof (total_pkts));
-  memset (total_bytes, 0, sizeof (total_bytes));
+  clib_memset (total_pkts, 0, sizeof (total_pkts));
+  clib_memset (total_bytes, 0, sizeof (total_bytes));
 
   vnet_interface_counter_lock (im);
 
@@ -3128,7 +3128,7 @@ stats_init (vlib_main_t * vm)
   sm->data_structure_lock =
     clib_mem_alloc_aligned (sizeof (data_structure_lock_t),
 			    CLIB_CACHE_LINE_BYTES);
-  memset (sm->data_structure_lock, 0, sizeof (*sm->data_structure_lock));
+  clib_memset (sm->data_structure_lock, 0, sizeof (*sm->data_structure_lock));
 
 #define _(N,n)                                                  \
     vl_msg_api_set_handlers(VL_API_##N, #n,                     \