1 diff -uNr binutils-2.15.94.0.2.2.orig/bfd/elf-bfd.h binutils-2.15.94.0.2.2/bfd/elf-bfd.h
2 --- binutils-2.15.94.0.2.2.orig/bfd/elf-bfd.h 2005-02-07 20:42:44.000000000 +0100
3 +++ binutils-2.15.94.0.2.2/bfd/elf-bfd.h 2005-02-20 13:13:17.362558200 +0100
5 /* Should the PT_GNU_RELRO segment be emitted? */
8 + /* Segment flags for the PT_PAX_FLAGS segment. */
9 + unsigned int pax_flags;
11 /* Symbol version definitions in external objects. */
12 Elf_Internal_Verdef *verdef;
14 --- binutils-2.17.50.0.3/bfd/elf.c.orig 2006-07-15 20:23:49.000000000 +0200
15 +++ binutils-2.17.50.0.3/bfd/elf.c 2006-07-17 10:47:54.374440000 +0200
17 case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
18 case PT_GNU_STACK: pt = "STACK"; break;
19 case PT_GNU_RELRO: pt = "RELRO"; break;
20 + case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break;
21 default: pt = NULL; break;
26 return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "relro");
29 + return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "pax_flags");
32 /* Check for any processor-specific program segment types. */
33 bed = get_elf_backend_data (abfd);
34 @@ -3633,6 +3637,11 @@
39 + /* We need a PT_PAX_FLAGS segment. */
43 for (s = abfd->sections; s != NULL; s = s->next)
45 if ((s->flags & SEC_LOAD) != 0
46 @@ -4116,6 +4125,20 @@
51 + amt = sizeof (struct elf_segment_map);
52 + m = bfd_zalloc (abfd, amt);
56 + m->p_type = PT_PAX_FLAGS;
57 + m->p_flags = elf_tdata (abfd)->pax_flags;
58 + m->p_flags_valid = 1;
65 elf_tdata (abfd)->segment_map = mfirst;
68 5. PT_GNU_STACK segments do not include any sections.
69 6. PT_TLS segment includes only SHF_TLS sections.
70 7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
71 - 8. PT_DYNAMIC should not contain empty sections at the beginning
72 + 8. PT_PAX_FLAGS segments do not include any sections.
73 + 9. PT_DYNAMIC should not contain empty sections at the beginning
74 (with the possible exception of .dynamic). */
75 #define INCLUDE_SECTION_IN_SEGMENT(section, segment, bed) \
76 ((((segment->p_paddr \
78 || IS_COREFILE_NOTE (segment, section)) \
79 && section->output_section != NULL \
80 && segment->p_type != PT_GNU_STACK \
81 + && segment->p_type != PT_PAX_FLAGS \
82 && (segment->p_type != PT_TLS \
83 || (section->flags & SEC_THREAD_LOCAL)) \
84 && (segment->p_type == PT_LOAD \
85 diff -uNr binutils-2.15.94.0.2.2.orig/bfd/elflink.c binutils-2.15.94.0.2.2/bfd/elflink.c
86 --- binutils-2.15.94.0.2.2.orig/bfd/elflink.c 2005-02-07 20:42:44.000000000 +0100
87 +++ binutils-2.15.94.0.2.2/bfd/elflink.c 2005-02-20 13:13:17.432547560 +0100
88 @@ -5286,16 +5286,30 @@
89 if (!is_elf_hash_table (info->hash))
92 + elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC;
95 + elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT;
96 + else if (info->noexecheap)
97 + elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT;
100 - elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
102 + elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
103 + elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
105 else if (info->noexecstack)
106 - elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
108 + elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
109 + elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
114 asection *notesec = NULL;
117 + elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
118 for (inputobj = info->input_bfds;
120 inputobj = inputobj->link_next)
121 @@ -5308,7 +5322,11 @@
124 if (s->flags & SEC_CODE)
127 + elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP;
128 + elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
134 diff -uNr binutils-2.15.94.0.2.2.orig/binutils/readelf.c binutils-2.15.94.0.2.2/binutils/readelf.c
135 --- binutils-2.15.94.0.2.2.orig/binutils/readelf.c 2005-02-18 07:14:30.000000000 +0100
136 +++ binutils-2.15.94.0.2.2/binutils/readelf.c 2005-02-20 13:13:17.470541784 +0100
137 @@ -2293,6 +2293,7 @@
138 return "GNU_EH_FRAME";
139 case PT_GNU_STACK: return "GNU_STACK";
140 case PT_GNU_RELRO: return "GNU_RELRO";
141 + case PT_PAX_FLAGS: return "PAX_FLAGS";
144 if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
145 diff -uNr binutils-2.15.94.0.2.2.orig/include/bfdlink.h binutils-2.15.94.0.2.2/include/bfdlink.h
146 --- binutils-2.15.94.0.2.2.orig/include/bfdlink.h 2004-11-22 21:33:32.000000000 +0100
147 +++ binutils-2.15.94.0.2.2/include/bfdlink.h 2005-02-20 13:13:17.476540872 +0100
150 unsigned int noexecstack: 1;
152 + /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT
154 + unsigned int execheap: 1;
156 + /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT
158 + unsigned int noexecheap: 1;
160 /* TRUE if PT_GNU_RELRO segment should be created. */
161 unsigned int relro: 1;
163 diff -uNr binutils-2.15.94.0.2.2.orig/include/elf/common.h binutils-2.15.94.0.2.2/include/elf/common.h
164 --- binutils-2.15.94.0.2.2.orig/include/elf/common.h 2004-11-22 21:33:32.000000000 +0100
165 +++ binutils-2.15.94.0.2.2/include/elf/common.h 2005-02-20 13:13:17.482539960 +0100
166 @@ -307,12 +307,27 @@
167 #define PT_GNU_STACK (PT_LOOS + 0x474e551) /* Stack flags */
168 #define PT_GNU_RELRO (PT_LOOS + 0x474e552) /* Read-only after relocation */
169 #define PT_GNU_SHR (PT_LOOS + 0x474e554) /* Sharable segment */
170 +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580) /* PaX flags */
172 /* Program segment permissions, in program header p_flags field. */
174 #define PF_X (1 << 0) /* Segment is executable */
175 #define PF_W (1 << 1) /* Segment is writable */
176 #define PF_R (1 << 2) /* Segment is readable */
178 +#define PF_PAGEEXEC (1 << 4) /* Enable PAGEEXEC */
179 +#define PF_NOPAGEEXEC (1 << 5) /* Disable PAGEEXEC */
180 +#define PF_SEGMEXEC (1 << 6) /* Enable SEGMEXEC */
181 +#define PF_NOSEGMEXEC (1 << 7) /* Disable SEGMEXEC */
182 +#define PF_MPROTECT (1 << 8) /* Enable MPROTECT */
183 +#define PF_NOMPROTECT (1 << 9) /* Disable MPROTECT */
184 +#define PF_RANDEXEC (1 << 10) /* Enable RANDEXEC */
185 +#define PF_NORANDEXEC (1 << 11) /* Disable RANDEXEC */
186 +#define PF_EMUTRAMP (1 << 12) /* Enable EMUTRAMP */
187 +#define PF_NOEMUTRAMP (1 << 13) /* Disable EMUTRAMP */
188 +#define PF_RANDMMAP (1 << 14) /* Enable RANDMMAP */
189 +#define PF_NORANDMMAP (1 << 15) /* Disable RANDMMAP */
191 /* #define PF_MASKOS 0x0F000000 *//* OS-specific reserved bits */
192 #define PF_MASKOS 0x0FF00000 /* New value, Oct 4, 1999 Draft */
193 #define PF_MASKPROC 0xF0000000 /* Processor-specific reserved bits */
194 diff -uNr binutils-2.15.94.0.2.2.orig/ld/emultempl/elf32.em binutils-2.15.94.0.2.2/ld/emultempl/elf32.em
195 --- binutils-2.15.94.0.2.2.orig/ld/emultempl/elf32.em 2004-11-22 21:33:33.000000000 +0100
196 +++ binutils-2.15.94.0.2.2/ld/emultempl/elf32.em 2005-02-20 13:13:17.492538440 +0100
197 @@ -1859,6 +1859,16 @@
198 link_info.noexecstack = TRUE;
199 link_info.execstack = FALSE;
201 + else if (strcmp (optarg, "execheap") == 0)
203 + link_info.execheap = TRUE;
204 + link_info.noexecheap = FALSE;
206 + else if (strcmp (optarg, "noexecheap") == 0)
208 + link_info.noexecheap = TRUE;
209 + link_info.execheap = FALSE;
213 if test -n "$COMMONPAGESIZE"; then
214 @@ -1925,6 +1935,7 @@
215 fprintf (file, _(" -z combreloc\t\tMerge dynamic relocs into one section and sort\n"));
216 fprintf (file, _(" -z defs\t\tReport unresolved symbols in object files.\n"));
217 fprintf (file, _(" -z execstack\t\tMark executable as requiring executable stack\n"));
218 + fprintf (file, _(" -z execheap\t\tMark executable as requiring executable heap\n"));
219 fprintf (file, _(" -z initfirst\t\tMark DSO to be initialized first at runtime\n"));
220 fprintf (file, _(" -z interpose\t\tMark object to interpose all DSOs but executable\n"));
221 fprintf (file, _(" -z lazy\t\tMark object lazy runtime binding (default)\n"));
222 @@ -1936,6 +1947,7 @@
223 fprintf (file, _(" -z nodelete\t\tMark DSO non-deletable at runtime\n"));
224 fprintf (file, _(" -z nodlopen\t\tMark DSO not available to dlopen\n"));
225 fprintf (file, _(" -z nodump\t\tMark DSO not available to dldump\n"));
226 + fprintf (file, _(" -z noexecheap\tMark executable as not requiring executable heap\n"));
227 fprintf (file, _(" -z noexecstack\tMark executable as not requiring executable stack\n"));
230 diff -uNr binutils-2.15.94.0.2.2.orig/ld/ldgram.y binutils-2.15.94.0.2.2/ld/ldgram.y
231 --- binutils-2.15.94.0.2.2.orig/ld/ldgram.y 2004-11-22 21:33:32.000000000 +0100
232 +++ binutils-2.15.94.0.2.2/ld/ldgram.y 2005-02-20 13:13:17.499537376 +0100
233 @@ -1073,6 +1073,8 @@
234 $$ = exp_intop (0x6474e550);
235 else if (strcmp (s, "PT_GNU_STACK") == 0)
236 $$ = exp_intop (0x6474e551);
237 + else if (strcmp (s, "PT_PAX_FLAGS") == 0)
238 + $$ = exp_intop (0x65041580);