elflint: Allow zero sized sections at (filesz) end of segment.

diff --git a/src/ChangeLog b/src/ChangeLog
index cae5e6b30711c4aabfd3c35590d465a392c703b5..af1d92bd767cb404d09724e8ab830a456d58c3af 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-09  Roland McGrath  <roland@hack.frob.com>
+
+       * elflint (check_sections): Allow zero sized sections at (filesz) end
+       of segment. And make check overflow-proofed.
+
 2012-04-24  Mark Wielaard  <mjw@redhat.com>
 
        * readelf.c (print_ops): Add DW_OP_GNU_push_tls_address,

diff --git a/src/elflint.c b/src/elflint.c
index a03caac1deaa65b2bb3323889b598964b519701e..7c56069434698a2179476580fe7e9dd2cd258ac8 100644 (file)
--- a/src/elflint.c
+++ b/src/elflint.c
@@ -3716,8 +3716,10 @@ section [%2zu] '%s' is both executable and writable\n"),
                    || (phdr->p_type == PT_TLS
                        && (shdr->sh_flags & SHF_TLS) != 0))
                && phdr->p_offset <= shdr->sh_offset
-               && (phdr->p_offset + phdr->p_filesz > shdr->sh_offset
-                   || (phdr->p_offset + phdr->p_memsz > shdr->sh_offset
+               && ((shdr->sh_offset - phdr->p_offset <= phdr->p_filesz
+                    && (shdr->sh_offset - phdr->p_offset < phdr->p_filesz
+                        || shdr->sh_size == 0))
+                   || (shdr->sh_offset - phdr->p_offset < phdr->p_memsz
                        && shdr->sh_type == SHT_NOBITS)))
              {
                /* Found the segment.  */