commit 1b84afcfb19375926c7d4910caa43266a4c4edd8
author Dimitry Ivanov <dimitry@google.com> Wed Jan 27 18:12:03 2016 -0800
committer Dimitry Ivanov <dimitry@google.com> Wed Jan 27 18:12:03 2016 -0800
tree 6bcf45f614a288b2b998c16ebf866e36abaf743c
parent fd799baf81e7642f2d91968ba01c39f097c0f357

linker: mark library .bss pages with anon:.bss

Bug: http://b/26778774
Change-Id: Ie2cdd841b7238de50ef389a897d79f915229616b

linker/linker_phdr.cpp

diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp
index e81e325..136e432 100644
--- a/linker/linker_phdr.cpp
+++ b/linker/linker_phdr.cpp
@@ -39,6 +39,8 @@
 #include "linker_debug.h"
 #include "linker_utils.h"
 
+#include "private/bionic_prctl.h"
+
 static int GetTargetElfMachine() {
 #if defined(__arm__)
   return EM_ARM;
@@ -540,8 +542,9 @@
     // between them. This is done by using a private anonymous
     // map for all extra pages.
     if (seg_page_end > seg_file_end) {
+      size_t zeromap_size = seg_page_end - seg_file_end;
       void* zeromap = mmap(reinterpret_cast<void*>(seg_file_end),
-                           seg_page_end - seg_file_end,
+                           zeromap_size,
                            PFLAGS_TO_PROT(phdr->p_flags),
                            MAP_FIXED|MAP_ANONYMOUS|MAP_PRIVATE,
                            -1,
@@ -550,6 +553,8 @@
         DL_ERR("couldn't zero fill \"%s\" gap: %s", name_.c_str(), strerror(errno));
         return false;
       }
+
+      prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, zeromap, zeromap_size, ".bss");
     }
   }
   return true;