From: Alan Modra <amodra@gmail.com>
To: binutils@sourceware.org
Subject: _bfd_elf_slurp_secondary_reloc_section sanity check
Date: Wed, 7 Dec 2022 14:22:54 +1030 [thread overview]
Message-ID: <Y5AOFp9g+oujWvPw@squeak.grove.modra.org> (raw)
* elf.c (_bfd_elf_slurp_secondary_reloc_section): Sanity check
section header against file size. Avoid overflow in
reloc_count.
diff --git a/bfd/elf.c b/bfd/elf.c
index ac10715fa93..5548efc44e4 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -13154,6 +13154,7 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd,
asection * relsec;
bool result = true;
bfd_vma (*r_sym) (bfd_vma);
+ ufile_ptr filesize;
#if BFD_DEFAULT_TARGET_SIZE > 32
if (bfd_arch_bits_per_address (abfd) != 32)
@@ -13167,6 +13168,7 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd,
/* Discover if there are any secondary reloc sections
associated with SEC. */
+ filesize = bfd_get_file_size (abfd);
for (relsec = abfd->sections; relsec != NULL; relsec = relsec->next)
{
Elf_Internal_Shdr * hdr = & elf_section_data (relsec)->this_hdr;
@@ -13180,10 +13182,10 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd,
bfd_byte * native_reloc;
arelent * internal_relocs;
arelent * internal_reloc;
- unsigned int i;
+ size_t i;
unsigned int entsize;
unsigned int symcount;
- unsigned int reloc_count;
+ bfd_size_type reloc_count;
size_t amt;
if (ebd->elf_info_to_howto == NULL)
@@ -13195,6 +13197,15 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd,
#endif
entsize = hdr->sh_entsize;
+ if (filesize != 0
+ && ((ufile_ptr) hdr->sh_offset > filesize
+ || hdr->sh_size > filesize - hdr->sh_offset))
+ {
+ bfd_set_error (bfd_error_file_truncated);
+ result = false;
+ continue;
+ }
+
native_relocs = bfd_malloc (hdr->sh_size);
if (native_relocs == NULL)
{
@@ -13268,7 +13279,7 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd,
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%pB(%pA): relocation %d has invalid symbol index %ld"),
+ (_("%pB(%pA): relocation %zu has invalid symbol index %lu"),
abfd, sec, i, (long) r_sym (rela.r_info));
bfd_set_error (bfd_error_bad_value);
internal_reloc->sym_ptr_ptr =
--
Alan Modra
Australia Development Lab, IBM
reply other threads:[~2022-12-07 3:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y5AOFp9g+oujWvPw@squeak.grove.modra.org \
--to=amodra@gmail.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).