aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2016-07-20 07:50:42 -0700
committerH.J. Lu <hjl.tools@gmail.com>2016-07-20 07:50:56 -0700
commit9ab8247228844bb6608d6b2c99b6d8732bab08c1 (patch)
treede829dde6a7a8e3baee15ac1042cdf3370bb95e4
parent027d97f8b0193a8113ee60bafc686d45d0af59ee (diff)
downloadgdb-9ab8247228844bb6608d6b2c99b6d8732bab08c1.zip
gdb-9ab8247228844bb6608d6b2c99b6d8732bab08c1.tar.gz
gdb-9ab8247228844bb6608d6b2c99b6d8732bab08c1.tar.bz2
Check p_paddr for program header space
Issue an error if p_paddr becomes invalid when allocating space for program headers. PR ld/20376 * elf.c (assign_file_positions_for_load_sections): Also check p_paddr for program header space.
-rw-r--r--bfd/elf.c4
-rw-r--r--ld/ChangeLog6
2 files changed, 9 insertions, 1 deletions
diff --git a/bfd/elf.c b/bfd/elf.c
index ebcf40a..2cc64e8 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -5271,7 +5271,9 @@ assign_file_positions_for_load_sections (bfd *abfd,
p->p_memsz = bed->s->sizeof_ehdr;
if (m->count > 0)
{
- if (p->p_vaddr < (bfd_vma) off)
+ if (p->p_vaddr < (bfd_vma) off
+ || (!m->p_paddr_valid
+ && p->p_paddr < (bfd_vma) off))
{
(*_bfd_error_handler)
(_("%B: Not enough room for program headers, try linking with -N"),
diff --git a/ld/ChangeLog b/ld/ChangeLog
index b744275..a2493d0 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-20 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/20376
+ * elf.c (assign_file_positions_for_load_sections): Also check
+ p_paddr for program header space.
+
2016-07-20 Alan Modra <amodra@gmail.com>
* ldexp.c (exp_unop, exp_binop, exp_trinop, exp_nameop): Don't