X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Felf.c;h=0b8aaa5d0036edb1a19bdf5898228d0da90ec84f;hb=350f6d6ef4955b8acb1ccfacd17ad5976398951c;hp=931fbcccc48d4306749c5daef84ec362ece677f4;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vppinfra/elf.c b/src/vppinfra/elf.c
index 931fbcccc48..0b8aaa5d003 100644
--- a/src/vppinfra/elf.c
+++ b/src/vppinfra/elf.c
@@ -983,7 +983,7 @@ elf_parse (elf_main_t * em, void *data, uword data_bytes)
 
   {
     char *save = em->file_name;
-    memset (em, 0, sizeof (em[0]));
+    clib_memset (em, 0, sizeof (em[0]));
     em->file_name = save;
   }
 
@@ -1357,6 +1357,8 @@ elf_read_file (elf_main_t * em, char *file_name)
       goto done;
     }
 
+  CLIB_MEM_UNPOISON (data, mmap_length);
+
   em->file_name = file_name;
 
   error = elf_parse (em, data, mmap_length);
@@ -1435,7 +1437,7 @@ static void string_table_init (string_table_builder_t * b, u8 * old_table)
 static void
 string_table_init (string_table_builder_t * b, u8 * old_table)
 {
-  memset (b, 0, sizeof (b[0]));
+  clib_memset (b, 0, sizeof (b[0]));
   b->old_table = old_table;
   b->hash = hash_create_string (0, sizeof (uword));
 }