This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] PR22361 readelf buffer overflow on fuzzed archive header
- From: Alan Modra <amodra at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 28 Oct 2017 11:46:42 -0000
- Subject: [binutils-gdb] PR22361 readelf buffer overflow on fuzzed archive header
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d91f0b20e561e326ee91a09a76206257bde8438b
commit d91f0b20e561e326ee91a09a76206257bde8438b
Author: Alan Modra <amodra@gmail.com>
Date: Sat Oct 28 21:31:16 2017 +1030
PR22361 readelf buffer overflow on fuzzed archive header
PR 22361
* readelf.c (process_archive_index_and_symbols): Ensure ar_size
field is zero terminated for strtoul.
(setup_archive, get_archive_member_name): Likewise.
Diff:
---
binutils/ChangeLog | 7 +++++++
binutils/elfcomm.c | 11 +++++++++++
2 files changed, 18 insertions(+)
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8d77c68..d0cd3c7 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-28 Alan Modra <amodra@gmail.com>
+
+ PR 22361
+ * readelf.c (process_archive_index_and_symbols): Ensure ar_size
+ field is zero terminated for strtoul.
+ (setup_archive, get_archive_member_name): Likewise.
+
2017-10-27 Simon Marchi <simon.marchi@ericsson.com>
* dwarf.c (struct Frame_Chunk) <cfa_reg>: Change type to
diff --git a/binutils/elfcomm.c b/binutils/elfcomm.c
index 0db8948..80f3fd8 100644
--- a/binutils/elfcomm.c
+++ b/binutils/elfcomm.c
@@ -466,8 +466,12 @@ process_archive_index_and_symbols (struct archive_info * arch,
{
size_t got;
unsigned long size;
+ char fmag_save;
+ fmag_save = arch->arhdr.ar_fmag[0];
+ arch->arhdr.ar_fmag[0] = 0;
size = strtoul (arch->arhdr.ar_size, NULL, 10);
+ arch->arhdr.ar_fmag[0] = fmag_save;
/* PR 17531: file: 912bd7de. */
if ((signed long) size < 0)
{
@@ -655,7 +659,10 @@ setup_archive (struct archive_info *arch, const char *file_name,
if (const_strneq (arch->arhdr.ar_name, "// "))
{
/* This is the archive string table holding long member names. */
+ char fmag_save = arch->arhdr.ar_fmag[0];
+ arch->arhdr.ar_fmag[0] = 0;
arch->longnames_size = strtoul (arch->arhdr.ar_size, NULL, 10);
+ arch->arhdr.ar_fmag[0] = fmag_save;
/* PR 17531: file: 01068045. */
if (arch->longnames_size < 8)
{
@@ -758,6 +765,7 @@ get_archive_member_name (struct archive_info *arch,
char *endp;
char *member_file_name;
char *member_name;
+ char fmag_save;
if (arch->longnames == NULL || arch->longnames_size == 0)
{
@@ -766,9 +774,12 @@ get_archive_member_name (struct archive_info *arch,
}
arch->nested_member_origin = 0;
+ fmag_save = arch->arhdr.ar_fmag[0];
+ arch->arhdr.ar_fmag[0] = 0;
k = j = strtoul (arch->arhdr.ar_name + 1, &endp, 10);
if (arch->is_thin_archive && endp != NULL && * endp == ':')
arch->nested_member_origin = strtoul (endp + 1, NULL, 10);
+ arch->arhdr.ar_fmag[0] = fmag_save;
if (j > arch->longnames_size)
{