Expand PHDR space only if there are pages available

[centaur.git] / src / libelfu / modelops / layout.c

diff --git a/src/libelfu/modelops/layout.c b/src/libelfu/modelops/layout.c
index 4026e58ce3e1e1a341201fe861bf8424b933aa17..2fd610ce3b0808f6858854c0aca0666b3d5ac4d4 100644 (file)
--- a/src/libelfu/modelops/layout.c
+++ b/src/libelfu/modelops/layout.c
@@ -101,7 +101,8 @@ static ElfuPhdr* appendPhdr(ElfuElf *me)
                                 &lowestOffs, &highestOffsEnd);
     if (phdr_maxsz < (me->ehdr.e_phnum + 1) * me->ehdr.e_phentsize
         && phdrmp == lowestAddr
-        && phdrmp == lowestOffs) {
+        && phdrmp == lowestOffs
+        && (lowestAddr->phdr.p_vaddr >= 2 * lowestAddr->phdr.p_align)) {
       ElfuPhdr *mp;
       ElfuScn *ms;
       GElf_Word size = ROUNDUP(me->ehdr.e_phentsize, phdrmp->phdr.p_align);
@@ -240,7 +241,8 @@ GElf_Addr elfu_mLayoutGetSpaceInPhdr(ElfuElf *me, GElf_Word size,
   } else if (((w && (lowestAddr->phdr.p_flags & PF_W))
               || (x && (lowestAddr->phdr.p_flags & PF_X)))
              && /* Enough space to expand downwards? */
-             (lowestAddr->phdr.p_vaddr > 3 * lowestAddr->phdr.p_align)
+             (lowestAddr->phdr.p_vaddr >= ((2 * lowestAddr->phdr.p_align)
+                                           + ROUNDUP(size, lowestAddr->phdr.p_align)))
              /* Merging only works if the LOAD is the first both in file and mem */
              && lowestAddr == lowestOffs) {
     /* Need to prepend or split up the PHDR. */