From: Roland McGrath <roland@gnu.org>
Date: Thu, 29 Nov 2012 19:09:10 +0000 (+0000)
Subject: bfd/
X-Git-Tag: binutils-2_23_2~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03cf7ba8ea246a8ab12dd600f6a9411b7247e067;p=thirdparty%2Fbinutils-gdb.git

bfd/
	* elf-nacl.c (segment_eligible_for_headers): Disallow writable segments.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5500b36a56b..28b27d30f0d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-29  Roland McGrath  <mcgrathr@google.com>
+
+	* elf-nacl.c (segment_eligible_for_headers): Disallow writable segments.
+
 2012-11-26  Roland McGrath  <mcgrathr@google.com>
 
 	* elf-nacl.c (nacl_modify_segment_map): Don't crash when INFO is null.
diff --git a/bfd/elf-nacl.c b/bfd/elf-nacl.c
index ce401fae3c4..6753c7cfbf2 100644
--- a/bfd/elf-nacl.c
+++ b/bfd/elf-nacl.c
@@ -43,9 +43,9 @@ segment_executable (struct elf_segment_map *seg)
 }
 
 /* Determine if this segment is eligible to receive the file and program
-   headers.  It must be non-executable and have contents.  Its first
-   section must start far enough past the page boundary to allow space
-   for the headers.  */
+   headers.  It must be read-only, non-executable, and have contents.
+   Its first section must start far enough past the page boundary to
+   allow space for the headers.  */
 static bfd_boolean
 segment_eligible_for_headers (struct elf_segment_map *seg,
                               bfd_vma maxpagesize, bfd_vma sizeof_headers)
@@ -56,7 +56,7 @@ segment_eligible_for_headers (struct elf_segment_map *seg,
     return FALSE;
   for (i = 0; i < seg->count; ++i)
     {
-      if (seg->sections[i]->flags & SEC_CODE)
+      if ((seg->sections[i]->flags & (SEC_CODE|SEC_READONLY)) != SEC_READONLY)
         return FALSE;
       if (seg->sections[i]->flags & SEC_HAS_CONTENTS)
         any_contents = TRUE;