From: "H.J. Lu" <hjl.tools@gmail.com>
To: binutils@sourceware.org
Cc: amodra@gmail.com
Subject: [PATCH] bfd_mmap_local: Check offset and size
Date: Wed, 3 Apr 2024 18:34:33 -0700 [thread overview]
Message-ID: <20240404013433.613048-1-hjl.tools@gmail.com> (raw)
Update bfd_mmap_local to return NULL if offset + size > the file size.
* libbfd.c (bfd_mmap_local): Validate offset and size against
the file size.
---
bfd/libbfd.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 34197b75b5e..400a5a47d2a 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -1072,18 +1072,15 @@ static void *
bfd_mmap_local (bfd *abfd, size_t rsize, int prot, void **map_addr,
size_t *map_size)
{
- if (!_bfd_constant_p (rsize))
+ ufile_ptr filesize = bfd_get_file_size (abfd);
+ ufile_ptr offset = bfd_tell (abfd);
+ if ((offset + rsize) > filesize)
{
- ufile_ptr filesize = bfd_get_file_size (abfd);
- if (filesize != 0 && rsize > filesize)
- {
- bfd_set_error (bfd_error_file_truncated);
- return NULL;
- }
+ bfd_set_error (bfd_error_file_truncated);
+ return NULL;
}
void *mem;
- ufile_ptr offset = bfd_tell (abfd);
mem = bfd_mmap (abfd, NULL, rsize, prot, MAP_PRIVATE, offset,
map_addr, map_size);
return mem;
--
2.44.0
next reply other threads:[~2024-04-04 1:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-04 1:34 H.J. Lu [this message]
2024-04-04 7:20 ` Alan Modra
2024-04-04 13:38 ` H.J. Lu
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=20240404013433.613048-1-hjl.tools@gmail.com \
--to=hjl.tools@gmail.com \
--cc=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).