From: Alan Modra <amodra@gmail.com>
To: binutils@sourceware.org
Subject: Correct ELF reloc size sanity check
Date: Wed, 26 Oct 2022 17:23:12 +1030 [thread overview]
Message-ID: <Y1jZWIeIvCCYm9/g@squeak.grove.modra.org> (raw)
The external reloc size check was wrong. Here asect is the code/data
section, not the reloc section. So using this_hdr gave the size of
the code/data section.
* elf.c (_bfd_elf_get_reloc_upper_bound): Properly get
external size from reloc headers.
diff --git a/bfd/elf.c b/bfd/elf.c
index 7cd7febcf95..81825b748d7 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -8708,15 +8708,20 @@ _bfd_elf_get_reloc_upper_bound (bfd *abfd, sec_ptr asect)
if (asect->reloc_count != 0 && !bfd_write_p (abfd))
{
/* Sanity check reloc section size. */
- struct bfd_elf_section_data *d = elf_section_data (asect);
- Elf_Internal_Shdr *rel_hdr = &d->this_hdr;
- bfd_size_type ext_rel_size = rel_hdr->sh_size;
ufile_ptr filesize = bfd_get_file_size (abfd);
- if (filesize != 0 && ext_rel_size > filesize)
+ if (filesize != 0)
{
- bfd_set_error (bfd_error_file_truncated);
- return -1;
+ struct bfd_elf_section_data *d = elf_section_data (asect);
+ bfd_size_type rel_size = d->rel.hdr ? d->rel.hdr->sh_size : 0;
+ bfd_size_type rela_size = d->rela.hdr ? d->rela.hdr->sh_size : 0;
+
+ if (rel_size + rela_size > filesize
+ || rel_size + rela_size < rel_size)
+ {
+ bfd_set_error (bfd_error_file_truncated);
+ return -1;
+ }
}
}
--
Alan Modra
Australia Development Lab, IBM
reply other threads:[~2022-10-26 6:53 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=Y1jZWIeIvCCYm9/g@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).