diff --git a/src/vnet/l2tp/l2tp.c b/src/vnet/l2tp/l2tp.c
index 300bd53..99ae6c4 100644
--- a/src/vnet/l2tp/l2tp.c
+++ b/src/vnet/l2tp/l2tp.c
@@ -334,7 +334,7 @@
     return VNET_API_ERROR_INVALID_VALUE;
 
   pool_get (lm->sessions, s);
-  memset (s, 0, sizeof (*s));
+  clib_memset (s, 0, sizeof (*s));
   clib_memcpy (&s->our_address, our_address, sizeof (s->our_address));
   clib_memcpy (&s->client_address, client_address,
 	       sizeof (s->client_address));
diff --git a/src/vnet/l2tp/l2tp_api.c b/src/vnet/l2tp/l2tp_api.c
index 0e0e2c2..6b48c14 100644
--- a/src/vnet/l2tp/l2tp_api.c
+++ b/src/vnet/l2tp/l2tp_api.c
@@ -65,7 +65,7 @@
 		    format_vnet_sw_interface_name, lm->vnet_main, si);
 
   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_IF_L2TPV3_TUNNEL_DETAILS);
   strncpy ((char *) mp->interface_name,
 	   (char *) if_name, ARRAY_LEN (mp->interface_name) - 1);