This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb/binutils-2_29-branch] Fix buffer overrun when parsing an ELF attribute string that is not NUL terminated.
- From: Nick Clifton <nickc at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 1 Sep 2017 08:59:57 -0000
- Subject: [binutils-gdb/binutils-2_29-branch] Fix buffer overrun when parsing an ELF attribute string that is not NUL terminated.
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=aceaeff8140af6ba50469e8b63d664cc91e5485b
commit aceaeff8140af6ba50469e8b63d664cc91e5485b
Author: Nick Clifton <nickc@redhat.com>
Date: Fri Sep 1 09:59:17 2017 +0100
Fix buffer overrun when parsing an ELF attribute string that is not NUL terminated.
PR 22058
* elf-attrs.c (_bfd_elf_parse_attributes): Ensure that the
attribute buffer is NUL terminated.
Diff:
---
bfd/ChangeLog | 6 ++++++
bfd/elf-attrs.c | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7d997fd..e9ea6cf 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-01 Nick Clifton <nickc@redhat.com>
+
+ PR 22058
+ * elf-attrs.c (_bfd_elf_parse_attributes): Ensure that the
+ attribute buffer is NUL terminated.
+
2017-08-30 Maciej W. Rozycki <macro@imgtec.com>
* elfxx-mips.c (mips_elf_perform_relocation): Correct microMIPS
diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c
index def1345..0210543 100644
--- a/bfd/elf-attrs.c
+++ b/bfd/elf-attrs.c
@@ -438,7 +438,7 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr)
/* PR 17512: file: 2844a11d. */
if (hdr->sh_size == 0)
return;
- contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
+ contents = (bfd_byte *) bfd_malloc (hdr->sh_size + 1);
if (!contents)
return;
if (!bfd_get_section_contents (abfd, hdr->bfd_section, contents, 0,
@@ -447,6 +447,8 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr)
free (contents);
return;
}
+ /* Ensure that the buffer is NUL terminated. */
+ contents[hdr->sh_size] = 0;
p = contents;
p_end = p + hdr->sh_size;
std_sec = get_elf_backend_data (abfd)->obj_attrs_vendor;