diff options
author | Mark Wielaard <mjw@redhat.com> | 2012-05-09 11:27:44 +0200 |
---|---|---|
committer | Mark Wielaard <mjw@redhat.com> | 2012-05-09 11:28:43 +0200 |
commit | 36aa5987df20c340fdfc584e04f4b3931a89abbd (patch) | |
tree | 5f9780ff354f5fd172765db8a2a60bef34e78e2c | |
parent | d9bc75fc20f0ce5064cac192a518af3c7192e96d (diff) | |
download | elfutils-36aa5987df20c340fdfc584e04f4b3931a89abbd.tar.gz |
elflint: Allow zero sized sections at (filesz) end of segment.
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/elflint.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cae5e6b3..af1d92bd 100644 --- 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 a03caac1..7c560694 100644 --- 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. */ |