diff options
| author | Nick Clifton <nickc@redhat.com> | 2017-06-14 16:50:03 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2017-06-14 16:50:03 +0100 |
| commit | ae87f7e73eba29bd38b3a9684a10b948ed715612 (patch) | |
| tree | 2623d2073e3b3b8ff831da059af8e7d019833d51 | |
| parent | 6394c606997f88acfc80de4dff33a4ae2de987b4 (diff) | |
| download | binutils-gdb-ae87f7e73eba29bd38b3a9684a10b948ed715612.tar.gz | |
Fix address violation when disassembling a corrupt binary.
PR binutils/21580
binutils * objdump.c (disassemble_bytes): Check for buffer overrun when
printing out rae insns.
ld * testsuite/ld-nds32/diff.d: Adjust expected output.
| -rw-r--r-- | binutils/objdump.c | 27 | ||||
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-nds32/diff.d | 6 |
3 files changed, 23 insertions, 15 deletions
diff --git a/binutils/objdump.c b/binutils/objdump.c index 6dc8318a5a9..05402edbebf 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -1918,20 +1918,23 @@ disassemble_bytes (struct disassemble_info * inf, for (j = addr_offset * opb; j < addr_offset * opb + pb; j += bpc) { - int k; - - if (bpc > 1 && inf->display_endian == BFD_ENDIAN_LITTLE) - { - for (k = bpc - 1; k >= 0; k--) - printf ("%02x", (unsigned) data[j + k]); - putchar (' '); - } - else + /* PR 21580: Check for a buffer ending early. */ + if (j + bpc <= stop_offset * opb) { - for (k = 0; k < bpc; k++) - printf ("%02x", (unsigned) data[j + k]); - putchar (' '); + int k; + + if (inf->display_endian == BFD_ENDIAN_LITTLE) + { + for (k = bpc - 1; k >= 0; k--) + printf ("%02x", (unsigned) data[j + k]); + } + else + { + for (k = 0; k < bpc; k++) + printf ("%02x", (unsigned) data[j + k]); + } } + putchar (' '); } for (; pb < octets_per_line; pb += bpc) diff --git a/ld/ChangeLog b/ld/ChangeLog index 8d5246424ba..72777eeea96 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2017-06-14 Nick Clifton <nickc@redhat.com> + + PR binutils/21580 + * testsuite/ld-nds32/diff.d: Adjust expected output. + 2017-06-14 H.J. Lu <hongjiu.lu@intel.com> PR ld/20022 diff --git a/ld/testsuite/ld-nds32/diff.d b/ld/testsuite/ld-nds32/diff.d index ef7958666fe..1aff7366def 100644 --- a/ld/testsuite/ld-nds32/diff.d +++ b/ld/testsuite/ld-nds32/diff.d @@ -7,9 +7,9 @@ Disassembly of section .data: 00008000 <WORD> (7e 00 00 00|00 00 00 7e).* -00008004 <HALF> (7e 00 7e fe|00 7e 7e fe).* -00008006 <BYTE> 7e fe 00 fe.* -00008007 <ULEB128> fe 00.* +00008004 <HALF> (7e 00|00 7e).* +00008006 <BYTE> 7e.* +00008007 <ULEB128> fe.* ... 00008009 <ULEB128_2> fe 00.* .* |