commit 46bf467a151eafaf37f6e3578d8d9bad705b8e44
author Brian Carlstrom <bdc@google.com> Tue May 21 17:23:09 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 21 17:23:09 2013 -0700
tree 9272bfeea2d0d076c7c81ed12c569f6196c453fe
parent 4c8eba6f2aaf351e29881ca4dc2ec47fc0246446
parent f5f29de6ae5a0b74234f111b5691a1e5588671cb

am f5f29de6: Merge "Fix bionic linker to support segments with zero p_filesz"

* commit 'f5f29de6ae5a0b74234f111b5691a1e5588671cb':
  Fix bionic linker to support segments with zero p_filesz

linker/linker_phdr.cpp

diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp
index 64dbb70..d1387f6 100644
--- a/linker/linker_phdr.cpp
+++ b/linker/linker_phdr.cpp
@@ -320,16 +320,19 @@
     Elf32_Addr file_end   = file_start + phdr->p_filesz;
 
     Elf32_Addr file_page_start = PAGE_START(file_start);
+    Elf32_Addr file_length = file_end - file_page_start;
 
-    void* seg_addr = mmap((void*)seg_page_start,
-                          file_end - file_page_start,
-                          PFLAGS_TO_PROT(phdr->p_flags),
-                          MAP_FIXED|MAP_PRIVATE,
-                          fd_,
-                          file_page_start);
-    if (seg_addr == MAP_FAILED) {
-      DL_ERR("couldn't map \"%s\" segment %d: %s", name_, i, strerror(errno));
-      return false;
+    if (file_length != 0) {
+      void* seg_addr = mmap((void*)seg_page_start,
+                            file_length,
+                            PFLAGS_TO_PROT(phdr->p_flags),
+                            MAP_FIXED|MAP_PRIVATE,
+                            fd_,
+                            file_page_start);
+      if (seg_addr == MAP_FAILED) {
+        DL_ERR("couldn't map \"%s\" segment %d: %s", name_, i, strerror(errno));
+        return false;
+      }
     }
 
     // if the segment is writable, and does not end on a page boundary,