MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

asan: alpha-vms: null dereference

Browse Source 
* vms-alpha.c (dst_restore_location): Validate index into
	dst_ptr_offsets array before accessing.  Return status.
	(dst_retrieve_location): Similarly, making "loc" parameter a
	pointer to return value.
	(_bfd_vms_slurp_etir): Update calls to above functions.
This commit is contained in:
Alan Modra 2020-03-16 08:44:38 +10:30
parent 6b9374f1e0
commit 7bac4137d7
2 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,3 +1,11 @@
2020-03-16 Alan Modra <amodra@gmail.com>
* vms-alpha.c (dst_restore_location): Validate index into
dst_ptr_offsets array before accessing. Return status.
(dst_retrieve_location): Similarly, making "loc" parameter a
pointer to return value.
(_bfd_vms_slurp_etir): Update calls to above functions.
2020-03-14 Kamil Rytarowski <n54@gmx.com>
* configure.ac: Include netbsd-core.lo for all NetBSD arm and mips

38
bfd/vms-alpha.c
View File

@ -1570,22 +1570,32 @@ dst_define_location (bfd *abfd, unsigned int loc)
/* Restore saved DST location counter from specified index. */
static void
static bfd_boolean
dst_restore_location (bfd *abfd, unsigned int loc)
{
vms_debug2 ((4, "dst_restore_location (%d)\n", (int)loc));
PRIV (image_offset) = PRIV (dst_ptr_offsets)[loc];
if (loc < PRIV (dst_ptr_offsets_count))
{
PRIV (image_offset) = PRIV (dst_ptr_offsets)[loc];
return TRUE;
}
return FALSE;
}
/* Retrieve saved DST location counter from specified index. */
static unsigned int
dst_retrieve_location (bfd *abfd, unsigned int loc)
static bfd_boolean
dst_retrieve_location (bfd *abfd, bfd_vma *loc)
{
vms_debug2 ((4, "dst_retrieve_location (%d)\n", (int)loc));
vms_debug2 ((4, "dst_retrieve_location (%d)\n", (int) *loc));
return PRIV (dst_ptr_offsets)[loc];
if (*loc < PRIV (dst_ptr_offsets_count))
{
*loc = PRIV (dst_ptr_offsets)[*loc];
return TRUE;
}
return FALSE;
}
/* Write multiple bytes to section image. */
@ -2326,7 +2336,12 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
return FALSE;
if (rel1 != RELC_NONE)
goto bad_context;
dst_restore_location (abfd, op1);
if (!dst_restore_location (abfd, op1))
{
bfd_set_error (bfd_error_bad_value);
_bfd_error_handler (_("invalid %s"), "ETIR__C_CTL_STLOC");
return FALSE;
}
break;
/* Stack defined location: pop index, push location counter from index
@ -2336,8 +2351,13 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
return FALSE;
if (rel1 != RELC_NONE)
goto bad_context;
if (!_bfd_vms_push (abfd, dst_retrieve_location (abfd, op1),
RELC_NONE))
if (!dst_retrieve_location (abfd, &op1))
{
bfd_set_error (bfd_error_bad_value);
_bfd_error_handler (_("invalid %s"), "ETIR__C_CTL_STKDL");
return FALSE;
}
if (!_bfd_vms_push (abfd, op1, RELC_NONE))
return FALSE;
break;