diff options
| author | Alan Modra <amodra@gmail.com> | 2022-12-23 09:27:14 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2022-12-23 10:35:38 +1030 |
| commit | 160a943ff8aa0dd9105164f10d4bfca9db872999 (patch) | |
| tree | f8f86d35b0a0d504dae87b91f67d9b4e0472cae9 | |
| parent | 2ac6aa431ecf8bf6afdc18020f3d6e55458df223 (diff) | |
| download | binutils-160a943ff8aa0dd9105164f10d4bfca9db872999.zip binutils-160a943ff8aa0dd9105164f10d4bfca9db872999.tar.gz binutils-160a943ff8aa0dd9105164f10d4bfca9db872999.tar.bz2 | |
COFF build-id writes uninitialised data to file
1) The first write in write_build_id wrote rubbish past the struct
external_IMAGE_DEBUG_DIRECTORY, which was later overwritten with
correct data. No user visible problem there, except that tools like
valgrind complain.
2) The size for the pdb name was incorrectly calculated.
* emultempl/pe.em (write_build_id): Write the debug directory,
not the entire section contents.
(setup_build_id): Add size for the base name of pdb_name, not
the full path.
* emultempl/pep.em: Likewise.
* testsuite/ld-pe/pdb2-section-contrib.d: Update.
| -rw-r--r-- | ld/emultempl/pe.em | 6 | ||||
| -rw-r--r-- | ld/emultempl/pep.em | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-pe/pdb2-section-contrib.d | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 9072595..1e0e23d 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -1285,7 +1285,6 @@ write_build_id (bfd *abfd) asection *asec; struct bfd_link_order *link_order = NULL; unsigned char *contents; - bfd_size_type size; bfd_size_type build_id_size; unsigned char *build_id; const char *pdb_base_name = NULL; @@ -1320,7 +1319,6 @@ write_build_id (bfd *abfd) if (t->build_id.sec->contents == NULL) t->build_id.sec->contents = (unsigned char *) xmalloc (t->build_id.sec->size); contents = t->build_id.sec->contents; - size = t->build_id.sec->size; build_id_size = compute_build_id_size (t->build_id.style); build_id = xmalloc (build_id_size); @@ -1351,7 +1349,7 @@ write_build_id (bfd *abfd) if (bfd_seek (abfd, asec->filepos + link_order->offset, SEEK_SET) != 0) return 0; - if (bfd_bwrite (contents, size, abfd) != size) + if (bfd_bwrite (contents, sizeof (*ext), abfd) != sizeof (*ext)) return 0; if (pdb) @@ -1417,7 +1415,7 @@ setup_build_id (bfd *ibfd) + sizeof (CV_INFO_PDB70) + 1; if (pdb_name) - s->size += strlen (pdb_name); + s->size += strlen (lbasename (pdb_name)); return true; } diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em index e2c538e..e614148 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em @@ -1277,7 +1277,6 @@ write_build_id (bfd *abfd) asection *asec; struct bfd_link_order *link_order = NULL; unsigned char *contents; - bfd_size_type size; bfd_size_type build_id_size; unsigned char *build_id; const char *pdb_base_name = NULL; @@ -1312,7 +1311,6 @@ write_build_id (bfd *abfd) if (t->build_id.sec->contents == NULL) t->build_id.sec->contents = (unsigned char *) xmalloc (t->build_id.sec->size); contents = t->build_id.sec->contents; - size = t->build_id.sec->size; build_id_size = compute_build_id_size (t->build_id.style); build_id = xmalloc (build_id_size); @@ -1343,7 +1341,7 @@ write_build_id (bfd *abfd) if (bfd_seek (abfd, asec->filepos + link_order->offset, SEEK_SET) != 0) return 0; - if (bfd_bwrite (contents, size, abfd) != size) + if (bfd_bwrite (contents, sizeof (*ext), abfd) != sizeof (*ext)) return 0; if (pdb) @@ -1409,7 +1407,7 @@ setup_build_id (bfd *ibfd) + sizeof (CV_INFO_PDB70) + 1; if (pdb_name) - s->size += strlen (pdb_name); + s->size += strlen (lbasename (pdb_name)); return true; } diff --git a/ld/testsuite/ld-pe/pdb2-section-contrib.d b/ld/testsuite/ld-pe/pdb2-section-contrib.d index 3afeb14..dd94372 100644 --- a/ld/testsuite/ld-pe/pdb2-section-contrib.d +++ b/ld/testsuite/ld-pe/pdb2-section-contrib.d @@ -4,7 +4,7 @@ tmpdir/pdb2-sc: file format binary Contents of section .data: 0000 2dba2ef1 01000000 00000000 10000000 -............... 0010 20000060 00000000 00000000 00000000 ..`............ - 0020 02000000 00000000 44000000 40000040 ........D...@..@ + 0020 02000000 00000000 3d000000 40000040 ........=...@..@ 0030 00000000 00000000 00000000 01000000 ................ 0040 10000000 10000000 20000060 01000000 ........ ..`.... 0050 00000000 00000000 04000000 00000000 ................ |