Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Re: vms buffer overflows and large memory allocation

Browse Source 
git commit c893ce360a changed buffer management, in the process
introducing a bug on an error return path.

	* vms-lib.c (vms_lib_read_index): Release correct buffer.
This commit is contained in:
Alan Modra
2020-02-26 15:14:48 +10:30
parent 450a1bfc7f
commit cc4c4f40a2
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bfd/ChangeLog
View File

@@ -1,3 +1,7 @@
2020-02-26 Alan Modra <amodra@gmail.com>
* vms-lib.c (vms_lib_read_index): Release correct buffer.
2020-02-26 Alan Modra <amodra@gmail.com>
* elf32-rx.c (rx_elf_relocate_section): Use bfd_malloc rather than

8
bfd/vms-lib.c
View File

@@ -416,6 +416,7 @@ vms_lib_read_index (bfd *abfd, int idx, unsigned int *nbrel)
unsigned int vbn;
ufile_ptr filesize;
size_t amt;
struct carsym *csbuf;
struct carsym_mem csm;
/* Read index desription. */
@@ -447,7 +448,7 @@ vms_lib_read_index (bfd *abfd, int idx, unsigned int *nbrel)
csm.max = csm.limit;
if (_bfd_mul_overflow (csm.max, sizeof (struct carsym), &amt))
return NULL;
csm.idx = bfd_alloc (abfd, amt);
csm.idx = csbuf = bfd_alloc (abfd, amt);
if (csm.idx == NULL)
return NULL;
@@ -455,12 +456,12 @@ vms_lib_read_index (bfd *abfd, int idx, unsigned int *nbrel)
vbn = bfd_getl32 (idd.vbn);
if (vbn != 0 && !vms_traverse_index (abfd, vbn, &csm))
{
if (csm.realloced && csm.idx != NULL)
if (csm.realloced)
free (csm.idx);
/* Note: in case of error, we can free what was allocated on the
BFD's objalloc. */
bfd_release (abfd, csm.idx);
bfd_release (abfd, csbuf);
return NULL;
}
@@ -468,7 +469,6 @@ vms_lib_read_index (bfd *abfd, int idx, unsigned int *nbrel)
{
/* There are more entries than the first estimate. Allocate on
the BFD's objalloc. */
struct carsym *csbuf;
csbuf = bfd_alloc (abfd, csm.nbr * sizeof (struct carsym));
if (csbuf == NULL)
return NULL;