OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix integer overflow problems when reading an ELF binary with corrupt augmentation data.

Browse Source 
PR 22386
	* dwarf.c (read_cie): Use bfd_size_type for
	augmentation_data_len.
	(display_augmentation_data): New function.
	(display_debug_frames): Use it.
	Check for integer overflow when testing augmentation_data_len.
This commit is contained in:
Nick Clifton 2017-11-03 13:57:15 +00:00
parent 3334eba7f4
commit bf59c5d5f4
2 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
binutils/ChangeLog
View File

@ -1,3 +1,13 @@
2017-11-03 Mingi Cho <mgcho.minic@gmail.com>
Nick Clifton <nickc@redhat.com>
PR 22386
* dwarf.c (read_cie): Use bfd_size_type for
augmentation_data_len.
(display_augmentation_data): New function.
(display_debug_frames): Use it.
Check for integer overflow when testing augmentation_data_len.
2017-11-02 Mingi Cho <mgcho.minic@gmail.com>
PR 22384

65
binutils/dwarf.c
View File

@ -6989,13 +6989,13 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, unsigned int *max_reg
static unsigned char *
read_cie (unsigned char *start, unsigned char *end,
Frame_Chunk **p_cie, int *p_version,
unsigned long *p_aug_len, unsigned char **p_aug)
bfd_size_type *p_aug_len, unsigned char **p_aug)
{
int version;
Frame_Chunk *fc;
unsigned int length_return;
unsigned char *augmentation_data = NULL;
unsigned long augmentation_data_len = 0;
bfd_size_type augmentation_data_len = 0;
* p_cie = NULL;
/* PR 17512: file: 001-228113-0.004. */
@ -7065,10 +7065,11 @@ read_cie (unsigned char *start, unsigned char *end,
READ_ULEB (augmentation_data_len);
augmentation_data = start;
/* PR 17512: file: 11042-2589-0.004. */
if (augmentation_data_len > (size_t) (end - start))
if (augmentation_data_len > (bfd_size_type) (end - start))
{
warn (_("Augmentation data too long: %#lx, expected at most %#lx\n"),
augmentation_data_len, (unsigned long) (end - start));
warn (_("Augmentation data too long: 0x%s, expected at most %#lx\n"),
dwarf_vmatoa ("x", augmentation_data_len),
(unsigned long) (end - start));
return end;
}
start += augmentation_data_len;
@ -7113,6 +7114,31 @@ read_cie (unsigned char *start, unsigned char *end,
return start;
}
/* Prints out the contents on the augmentation data array.
If do_wide is not enabled, then formats the output to fit into 80 columns. */
static void
display_augmentation_data (const unsigned char * data, const bfd_size_type len)
{
bfd_size_type i;
i = printf (_(" Augmentation data: "));
if (do_wide || len < ((80 - i) / 3))
for (i = 0; i < len; ++i)
printf (" %02x", data[i]);
else
{
for (i = 0; i < len; ++i)
{
if (i % (80 / 3) == 0)
putchar ('\n');
printf (" %02x", data[i]);
}
}
putchar ('\n');
}
static int
display_debug_frames (struct dwarf_section *section,
void *file ATTRIBUTE_UNUSED)
@ -7141,7 +7167,7 @@ display_debug_frames (struct dwarf_section *section,
Frame_Chunk *cie;
int need_col_headers = 1;
unsigned char *augmentation_data = NULL;
unsigned long augmentation_data_len = 0;
bfd_size_type augmentation_data_len = 0;
unsigned int encoded_ptr_size = saved_eh_addr_size;
unsigned int offset_size;
unsigned int initial_length_size;
@ -7235,16 +7261,8 @@ display_debug_frames (struct dwarf_section *section,
printf (" Return address column: %d\n", fc->ra);
if (augmentation_data_len)
{
unsigned long i;
display_augmentation_data (augmentation_data, augmentation_data_len);
printf (" Augmentation data: ");
for (i = 0; i < augmentation_data_len; ++i)
/* FIXME: If do_wide is FALSE, then we should
add carriage returns at 80 columns... */
printf (" %02x", augmentation_data[i]);
putchar ('\n');
}
putchar ('\n');
}
}
@ -7400,11 +7418,13 @@ display_debug_frames (struct dwarf_section *section,
READ_ULEB (augmentation_data_len);
augmentation_data = start;
start += augmentation_data_len;
/* PR 17512: file: 722-8446-0.004. */
if (start >= end || ((signed long) augmentation_data_len) < 0)
/* PR 17512 file: 722-8446-0.004 and PR 22386. */
if (start >= end
|| ((bfd_signed_vma) augmentation_data_len) < 0
|| augmentation_data > start)
{
warn (_("Corrupt augmentation data length: %lx\n"),
augmentation_data_len);
warn (_("Corrupt augmentation data length: 0x%s\n"),
dwarf_vmatoa ("x", augmentation_data_len));
start = end;
augmentation_data = NULL;
augmentation_data_len = 0;
@ -7426,12 +7446,7 @@ display_debug_frames (struct dwarf_section *section,
if (! do_debug_frames_interp && augmentation_data_len)
{
unsigned long i;
printf (" Augmentation data: ");
for (i = 0; i < augmentation_data_len; ++i)
printf (" %02x", augmentation_data[i]);
putchar ('\n');
display_augmentation_data (augmentation_data, augmentation_data_len);
putchar ('\n');
}
}