diff options
| author | Alan Modra <amodra@gmail.com> | 2023-08-22 21:13:41 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2023-08-23 10:07:45 +0930 |
| commit | 8c8145a43ee4815b8851f8da7091c04f551dff6e (patch) | |
| tree | ba368cb19bfdeb00b9a51e22dd01edafc0ca5859 /bfd/linker.c | |
| parent | e2ce77cd639c86ce89b10ee70e73bd09670e0111 (diff) | |
| download | binutils-8c8145a43ee4815b8851f8da7091c04f551dff6e.zip binutils-8c8145a43ee4815b8851f8da7091c04f551dff6e.tar.gz binutils-8c8145a43ee4815b8851f8da7091c04f551dff6e.tar.bz2 | |
bfd_get_symbol_leading_char vs. ""
Some places matching the first char of a string against
bfd_get_symbol_leading_char, which may be zero, didn't check for the
string being "". This patch adds the check to stop accesses past the
end of the string and potential buffer overruns.
The dlltool one was found by oss-fuzz quite a while ago.
bfd/
* cofflink.c (_bfd_coff_link_input_bfd): Ensure a zero
bfd_get_symbol_leading_char doesn't lead to accessing past the
zero string terminator.
* linker.c (bfd_wrapped_link_hash_lookup): Likewise.
(unwrap_hash_lookup): Likewise.
binutils/
* dlltool.c (scan_filtered_symbols): Ensure a zero
bfd_get_symbol_leading_char doesn't lead to accessing past the
zero string terminator.
Diffstat (limited to 'bfd/linker.c')
| -rw-r--r-- | bfd/linker.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/bfd/linker.c b/bfd/linker.c index 0f4f9a1..28fffc3 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -544,7 +544,9 @@ bfd_wrapped_link_hash_lookup (bfd *abfd, char prefix = '\0'; l = string; - if (*l == bfd_get_symbol_leading_char (abfd) || *l == info->wrap_char) + if (*l + && (*l == bfd_get_symbol_leading_char (abfd) + || *l == info->wrap_char)) { prefix = *l; ++l; @@ -621,8 +623,9 @@ unwrap_hash_lookup (struct bfd_link_info *info, { const char *l = h->root.string; - if (*l == bfd_get_symbol_leading_char (input_bfd) - || *l == info->wrap_char) + if (*l + && (*l == bfd_get_symbol_leading_char (input_bfd) + || *l == info->wrap_char)) ++l; if (startswith (l, WRAP)) |