espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 00:59:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

asan: ns32k: wild memory write

Browse Source 
index_offset isn't set up for "sfsr", resulting in a random offset
being used when trying to disassemble the following.

 .byte 0x3e, 0xf7, 0x07, 0x00

	* ns32k-dis.c (Is_gen): Use strchr, add 'f'.
	(print_insn_ns32k): Adjust ioffset for 'f' index_offset.
This commit is contained in:
Alan Modra
2020-01-13 17:58:02 +10:30
parent febda64f15
commit 90dee485e5
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opcodes/ChangeLog
View File

@ -1,3 +1,8 @@
2020-01-13 Alan Modra <amodra@gmail.com>
* ns32k-dis.c (Is_gen): Use strchr, add 'f'.
(print_insn_ns32k): Adjust ioffset for 'f' index_offset.
2020-01-13 Alan Modra <amodra@gmail.com> 2020-01-13 Alan Modra <amodra@gmail.com>
* wasm32-dis.c (print_insn_wasm32): Localise variables. Store * wasm32-dis.c (print_insn_wasm32): Localise variables. Store

11
opcodes/ns32k-dis.c
View File

@ -347,9 +347,7 @@ flip_bytes (char *ptr, int count)
} }
/* Given a character C, does it represent a general addressing mode? */ /* Given a character C, does it represent a general addressing mode? */
#define Is_gen(c) \ #define Is_gen(c) (strchr ("FLBWDAIZf", (c)) != NULL)
((c) == 'F' || (c) == 'L' || (c) == 'B' \
|| (c) == 'W' || (c) == 'D' || (c) == 'A' || (c) == 'I' || (c) == 'Z')
/* Adressing modes. */ /* Adressing modes. */
#define Adrmod_index_byte 0x1c #define Adrmod_index_byte 0x1c
@ -808,9 +806,10 @@ print_insn_ns32k (bfd_vma memaddr, disassemble_info *info)
if we are using scaled indexed addressing mode, since the index if we are using scaled indexed addressing mode, since the index
bytes occur right after the basic instruction, not as part bytes occur right after the basic instruction, not as part
of the addressing extension. */ of the addressing extension. */
if (Is_gen(d[1])) if (Is_gen (d[1]))
{ {
int addr_mode = bit_extract (buffer, ioffset - 5, 5); int bitoff = d[1] == 'f' ? 10 : 5;
int addr_mode = bit_extract (buffer, ioffset - bitoff, 5);
if (Adrmod_is_index (addr_mode)) if (Adrmod_is_index (addr_mode))
{ {
@ -819,7 +818,7 @@ print_insn_ns32k (bfd_vma memaddr, disassemble_info *info)
} }
} }
if (d[2] && Is_gen(d[3])) if (d[2] && Is_gen (d[3]))
{ {
int addr_mode = bit_extract (buffer, ioffset - 10, 5); int addr_mode = bit_extract (buffer, ioffset - 10, 5);