2 files changed, 8 insertions, 8 deletions

diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c
index d3ed2af18fd..3bbdd05cd4d 100644
--- a/src/vnet/devices/tap/tap.c
+++ b/src/vnet/devices/tap/tap.c
@@ -115,7 +115,7 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args)
       return;
     }
 
-  memset (&ifr, 0, sizeof (ifr));
+  clib_memset (&ifr, 0, sizeof (ifr));
   pool_get (vim->interfaces, vif);
   vif->dev_instance = vif - vim->interfaces;
   vif->tap_fd = -1;
@@ -317,7 +317,7 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args)
   /* Set vhost memory table */
   i = sizeof (struct vhost_memory) + sizeof (struct vhost_memory_region);
   vhost_mem = clib_mem_alloc (i);
-  memset (vhost_mem, 0, i);
+  clib_memset (vhost_mem, 0, i);
   vhost_mem->nregions = 1;
   vhost_mem->regions[0].memory_size = (1ULL << 47) - 4096;
   _IOCTL (vif->fd, VHOST_SET_MEM_TABLE, vhost_mem);
@@ -405,7 +405,7 @@ error:
     close (vif->fd);
   vec_foreach_index (i, vif->vrings) virtio_vring_free (vm, vif, i);
   vec_free (vif->vrings);
-  memset (vif, 0, sizeof (virtio_if_t));
+  clib_memset (vif, 0, sizeof (virtio_if_t));
   pool_put (vim->interfaces, vif);
 
 done:
@@ -449,7 +449,7 @@ tap_delete_if (vlib_main_t * vm, u32 sw_if_index)
 
   tm->tap_ids = clib_bitmap_set (tm->tap_ids, vif->id, 0);
   clib_spinlock_free (&vif->lockp);
-  memset (vif, 0, sizeof (*vif));
+  clib_memset (vif, 0, sizeof (*vif));
   pool_put (mm->interfaces, vif);
 
   return 0;
@@ -468,7 +468,7 @@ tap_dump_ifs (tap_interface_details_t ** out_tapids)
   /* *INDENT-OFF* */
   pool_foreach (vif, mm->interfaces,
     vec_add2(r_tapids, tapid, 1);
-    memset (tapid, 0, sizeof (*tapid));
+    clib_memset (tapid, 0, sizeof (*tapid));
     tapid->id = vif->id;
     tapid->sw_if_index = vif->sw_if_index;
     hi = vnet_get_hw_interface (vnm, vif->hw_if_index);
diff --git a/src/vnet/devices/tap/tapv2_api.c b/src/vnet/devices/tap/tapv2_api.c
index f0c980a64fa..e70d63f914f 100644
--- a/src/vnet/devices/tap/tapv2_api.c
+++ b/src/vnet/devices/tap/tapv2_api.c
@@ -58,7 +58,7 @@ vl_api_tap_create_v2_t_handler (vl_api_tap_create_v2_t * mp)
   vl_api_registration_t *reg;
   tap_create_if_args_t _a, *ap = &_a;
 
-  memset (ap, 0, sizeof (*ap));
+  clib_memset (ap, 0, sizeof (*ap));
 
   ap->id = ntohl (mp->id);
   if (!mp->use_random_mac)
@@ -142,7 +142,7 @@ tap_send_sw_interface_event_deleted (vpe_api_main_t * am,
   vl_api_sw_interface_event_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_EVENT);
   mp->sw_if_index = ntohl (sw_if_index);
 
@@ -190,7 +190,7 @@ tap_send_sw_interface_details (vpe_api_main_t * am,
 {
   vl_api_sw_interface_tap_v2_details_t *mp;
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = htons (VL_API_SW_INTERFACE_TAP_V2_DETAILS);
   mp->id = htonl (tap_if->id);
   mp->sw_if_index = htonl (tap_if->sw_if_index);