commit 07c85f1688182bec2aa21a2195997e7893ad6a4d
author Victor Khimenko <khim@google.com> Mon Sep 28 20:46:50 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 28 20:46:50 2020 +0000
tree 3424c0411a26ebd0235db71f4727e02f17cc783d
parent d510f2273209fec81f7b5d457e72cd75a5bc34dd
parent 6427f39ba9a77ba6d83de5f9b79fedc66edf5522

Merge "Make __clone_for_fork pure native bridge mode abstraction"

libc/malloc_debug/MapData.cpp

diff --git a/libc/malloc_debug/MapData.cpp b/libc/malloc_debug/MapData.cpp
index e8fbc54..ded81a2 100644
--- a/libc/malloc_debug/MapData.cpp
+++ b/libc/malloc_debug/MapData.cpp
@@ -116,14 +116,17 @@
     if (!get_val<ElfW(Word)>(entry, addr + offsetof(ElfW(Phdr), p_type), &phdr.p_type)) {
       return;
     }
+    if (!get_val<ElfW(Word)>(entry, addr + offsetof(ElfW(Phdr), p_flags), &phdr.p_flags)) {
+      return;
+    }
     if (!get_val<ElfW(Off)>(entry, addr + offsetof(ElfW(Phdr), p_offset), &phdr.p_offset)) {
       return;
     }
-    if (phdr.p_type == PT_LOAD && phdr.p_offset == entry->offset) {
+    if ((phdr.p_type == PT_LOAD) && (phdr.p_flags & PF_X) ) {
       if (!get_val<ElfW(Addr)>(entry, addr + offsetof(ElfW(Phdr), p_vaddr), &phdr.p_vaddr)) {
         return;
       }
-      entry->load_bias = phdr.p_vaddr;
+      entry->load_bias = phdr.p_vaddr - phdr.p_offset;
       return;
     }
     addr += sizeof(phdr);