mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-02-23 13:21:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

nfp: add validity check of island and me

Browse Source 
AddressSanitizer detects heap-buffer-overflow when running
"objdump -D" for nfp .nffw files.

	PR 27854
	* nfp-dis.c (_NFP_ISLAND_MAX, _NFP_ME_MAX): Define.
	(nfp_priv_data): ..and use here.
	(_print_instrs): Sanity check island and menum.

Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
This commit is contained in:
Yinjun Zhang 2021-08-25 21:01:17 -04:00 committed by Alan Modra
parent 64cb17196c
commit 90f56146e5
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opcodes/nfp-dis.c
View File

@ -46,6 +46,9 @@
#define _NFP_ME27_28_CSR_CTX_ENABLES 0x18
#define _NFP_ME27_28_CSR_MISC_CONTROL 0x160
#define _NFP_ISLAND_MAX 64
#define _NFP_ME_MAX 12
typedef struct
{
unsigned char ctx4_mode:1;
@ -65,7 +68,7 @@ nfp_opts;
/* mecfgs[island][menum][is-text] */
typedef struct
{
nfp_priv_mecfg mecfgs[64][12][2];
nfp_priv_mecfg mecfgs[_NFP_ISLAND_MAX][_NFP_ME_MAX][2];
}
nfp_priv_data;
@ -2837,6 +2840,12 @@ _print_instrs (bfd_vma addr, struct disassemble_info *dinfo, nfp_opts * opts)
break;
}
if (island >= _NFP_ISLAND_MAX || menum >= _NFP_ME_MAX)
{
dinfo->fprintf_func (dinfo->stream, "Invalid island or me.");
return _NFP_ERR_STOP;
}
mecfg = &priv->mecfgs[island][menum][is_text];
num_ctx = (mecfg->ctx4_mode) ? 4 : 8;
addr_3rdparty32 = mecfg->addr_3rdparty32;