3 files changed, 6 insertions, 6 deletions
diff --git a/src/vnet/geneve/decap.c b/src/vnet/geneve/decap.c
index f525fa323a6..93f2a8548c1 100644
--- a/src/vnet/geneve/decap.c
+++ b/src/vnet/geneve/decap.c
@@ -88,7 +88,7 @@ geneve_input (vlib_main_t * vm,
   if (is_ip4)
     last_key4.as_u64 = ~0;
   else
-    memset (&last_key6, 0xff, sizeof (last_key6));
+    clib_memset (&last_key6, 0xff, sizeof (last_key6));
 
   from = vlib_frame_vector_args (from_frame);
   n_left_from = from_frame->n_vectors;
diff --git a/src/vnet/geneve/geneve.c b/src/vnet/geneve/geneve.c
index ac097f915cb..c53a67a1abd 100644
--- a/src/vnet/geneve/geneve.c
+++ b/src/vnet/geneve/geneve.c
@@ -395,7 +395,7 @@ int vnet_geneve_add_del_tunnel
 	return VNET_API_ERROR_INVALID_DECAP_NEXT;
 
       pool_get_aligned (vxm->tunnels, t, CLIB_CACHE_LINE_BYTES);
-      memset (t, 0, sizeof (*t));
+      clib_memset (t, 0, sizeof (*t));
 
       /* copy from arg structure */
 #define _(x) t->x = a->x;
@@ -670,8 +670,8 @@ geneve_add_del_tunnel_command_fn (vlib_main_t * vm,
   clib_error_t *error = NULL;
 
   /* Cant "universally zero init" (={0}) due to GCC bug 53119 */
-  memset (&local, 0, sizeof local);
-  memset (&remote, 0, sizeof remote);
+  clib_memset (&local, 0, sizeof local);
+  clib_memset (&remote, 0, sizeof remote);
 
   /* Get a line of input. */
   if (!unformat_user (input, unformat_line_input, line_input))
@@ -807,7 +807,7 @@ geneve_add_del_tunnel_command_fn (vlib_main_t * vm,
       goto done;
     }
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
 
   a->is_add = is_add;
   a->is_ip6 = ipv6_set;
diff --git a/src/vnet/geneve/geneve_api.c b/src/vnet/geneve/geneve_api.c
index 9d0830c1ce5..6aa9fa43db2 100644
--- a/src/vnet/geneve/geneve_api.c
+++ b/src/vnet/geneve/geneve_api.c
@@ -121,7 +121,7 @@ static void send_geneve_tunnel_details
   u8 is_ipv6 = !ip46_address_is_ip4 (&t->remote);
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = ntohs (VL_API_GENEVE_TUNNEL_DETAILS);
   if (is_ipv6)
     {