1 --- binutils-2.15.94.0.2.2.orig/bfd/elf-bfd.h 2005-02-07 20:42:44.000000000 +0100
2 +++ binutils-2.15.94.0.2.2/bfd/elf-bfd.h 2005-02-20 13:13:17.362558200 +0100
4 /* Should the PT_GNU_RELRO segment be emitted? */
7 + /* Segment flags for the PT_PAX_FLAGS segment. */
8 + unsigned int pax_flags;
10 /* Symbol version definitions in external objects. */
11 Elf_Internal_Verdef *verdef;
13 --- binutils-2.17.50.0.3/bfd/elf.c.orig 2006-07-15 20:23:49.000000000 +0200
14 +++ binutils-2.17.50.0.3/bfd/elf.c 2006-07-17 10:47:54.374440000 +0200
16 case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
17 case PT_GNU_STACK: pt = "STACK"; break;
18 case PT_GNU_RELRO: pt = "RELRO"; break;
19 + case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break;
20 default: pt = NULL; break;
25 return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "relro");
28 + return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "pax_flags");
31 /* Check for any processor-specific program segment types. */
32 bed = get_elf_backend_data (abfd);
33 @@ -3633,6 +3637,11 @@
38 + /* We need a PT_PAX_FLAGS segment. */
42 for (s = abfd->sections; s != NULL; s = s->next)
44 if ((s->flags & SEC_LOAD) != 0
45 @@ -4116,6 +4125,20 @@
50 + amt = sizeof (struct elf_segment_map);
51 + m = bfd_zalloc (abfd, amt);
55 + m->p_type = PT_PAX_FLAGS;
56 + m->p_flags = elf_tdata (abfd)->pax_flags;
57 + m->p_flags_valid = 1;
64 elf_tdata (abfd)->segment_map = mfirst;
67 5. PT_GNU_STACK segments do not include any sections.
68 6. PT_TLS segment includes only SHF_TLS sections.
69 7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
70 - 8. PT_DYNAMIC should not contain empty sections at the beginning
71 + 8. PT_PAX_FLAGS segments do not include any sections.
72 + 9. PT_DYNAMIC should not contain empty sections at the beginning
73 (with the possible exception of .dynamic). */
74 #define INCLUDE_SECTION_IN_SEGMENT(section, segment, bed) \
75 ((((segment->p_paddr \
77 || IS_COREFILE_NOTE (segment, section)) \
78 && section->output_section != NULL \
79 && segment->p_type != PT_GNU_STACK \
80 + && segment->p_type != PT_PAX_FLAGS \
81 && (segment->p_type != PT_TLS \
82 || (section->flags & SEC_THREAD_LOCAL)) \
83 && (segment->p_type == PT_LOAD \
84 --- binutils-2.17.50.0.13/bfd/elflink.c.orig 2007-03-16 20:44:46.377789106 +0100
85 +++ binutils-2.17.50.0.13/bfd/elflink.c 2007-03-16 20:45:24.781816352 +0100
86 @@ -5296,16 +5296,30 @@
89 bed = get_elf_backend_data (output_bfd);
90 + elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC;
93 + elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT;
94 + else if (info->noexecheap)
95 + elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT;
98 - elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
100 + elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
101 + elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
103 else if (info->noexecstack)
104 - elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
106 + elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
107 + elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
112 asection *notesec = NULL;
115 + elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
116 for (inputobj = info->input_bfds;
118 inputobj = inputobj->link_next)
119 @@ -5318,7 +5332,11 @@
122 if (s->flags & SEC_CODE)
125 + elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP;
126 + elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
131 else if (bed->default_execstack)
132 --- binutils-2.15.94.0.2.2.orig/binutils/readelf.c 2005-02-18 07:14:30.000000000 +0100
133 +++ binutils-2.15.94.0.2.2/binutils/readelf.c 2005-02-20 13:13:17.470541784 +0100
134 @@ -2293,6 +2293,7 @@
135 return "GNU_EH_FRAME";
136 case PT_GNU_STACK: return "GNU_STACK";
137 case PT_GNU_RELRO: return "GNU_RELRO";
138 + case PT_PAX_FLAGS: return "PAX_FLAGS";
141 if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
142 --- binutils-2.15.94.0.2.2.orig/include/bfdlink.h 2004-11-22 21:33:32.000000000 +0100
143 +++ binutils-2.15.94.0.2.2/include/bfdlink.h 2005-02-20 13:13:17.476540872 +0100
146 unsigned int noexecstack: 1;
148 + /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT
150 + unsigned int execheap: 1;
152 + /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT
154 + unsigned int noexecheap: 1;
156 /* TRUE if PT_GNU_RELRO segment should be created. */
157 unsigned int relro: 1;
159 --- binutils-2.15.94.0.2.2.orig/include/elf/common.h 2004-11-22 21:33:32.000000000 +0100
160 +++ binutils-2.15.94.0.2.2/include/elf/common.h 2005-02-20 13:13:17.482539960 +0100
161 @@ -307,12 +307,27 @@
162 #define PT_GNU_STACK (PT_LOOS + 0x474e551) /* Stack flags */
163 #define PT_GNU_RELRO (PT_LOOS + 0x474e552) /* Read-only after relocation */
164 #define PT_GNU_SHR (PT_LOOS + 0x474e554) /* Sharable segment */
165 +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580) /* PaX flags */
167 /* Program segment permissions, in program header p_flags field. */
169 #define PF_X (1 << 0) /* Segment is executable */
170 #define PF_W (1 << 1) /* Segment is writable */
171 #define PF_R (1 << 2) /* Segment is readable */
173 +#define PF_PAGEEXEC (1 << 4) /* Enable PAGEEXEC */
174 +#define PF_NOPAGEEXEC (1 << 5) /* Disable PAGEEXEC */
175 +#define PF_SEGMEXEC (1 << 6) /* Enable SEGMEXEC */
176 +#define PF_NOSEGMEXEC (1 << 7) /* Disable SEGMEXEC */
177 +#define PF_MPROTECT (1 << 8) /* Enable MPROTECT */
178 +#define PF_NOMPROTECT (1 << 9) /* Disable MPROTECT */
179 +#define PF_RANDEXEC (1 << 10) /* Enable RANDEXEC */
180 +#define PF_NORANDEXEC (1 << 11) /* Disable RANDEXEC */
181 +#define PF_EMUTRAMP (1 << 12) /* Enable EMUTRAMP */
182 +#define PF_NOEMUTRAMP (1 << 13) /* Disable EMUTRAMP */
183 +#define PF_RANDMMAP (1 << 14) /* Enable RANDMMAP */
184 +#define PF_NORANDMMAP (1 << 15) /* Disable RANDMMAP */
186 /* #define PF_MASKOS 0x0F000000 *//* OS-specific reserved bits */
187 #define PF_MASKOS 0x0FF00000 /* New value, Oct 4, 1999 Draft */
188 #define PF_MASKPROC 0xF0000000 /* Processor-specific reserved bits */
189 --- binutils-2.15.94.0.2.2.orig/ld/emultempl/elf32.em 2004-11-22 21:33:33.000000000 +0100
190 +++ binutils-2.15.94.0.2.2/ld/emultempl/elf32.em 2005-02-20 13:13:17.492538440 +0100
191 @@ -1859,6 +1859,16 @@
192 link_info.noexecstack = TRUE;
193 link_info.execstack = FALSE;
195 + else if (strcmp (optarg, "execheap") == 0)
197 + link_info.execheap = TRUE;
198 + link_info.noexecheap = FALSE;
200 + else if (strcmp (optarg, "noexecheap") == 0)
202 + link_info.noexecheap = TRUE;
203 + link_info.execheap = FALSE;
207 if test -n "$COMMONPAGESIZE"; then
208 @@ -1925,6 +1935,7 @@
209 fprintf (file, _(" -z combreloc\t\tMerge dynamic relocs into one section and sort\n"));
210 fprintf (file, _(" -z defs\t\tReport unresolved symbols in object files.\n"));
211 fprintf (file, _(" -z execstack\t\tMark executable as requiring executable stack\n"));
212 + fprintf (file, _(" -z execheap\t\tMark executable as requiring executable heap\n"));
213 fprintf (file, _(" -z initfirst\t\tMark DSO to be initialized first at runtime\n"));
214 fprintf (file, _(" -z interpose\t\tMark object to interpose all DSOs but executable\n"));
215 fprintf (file, _(" -z lazy\t\tMark object lazy runtime binding (default)\n"));
216 @@ -1936,6 +1947,7 @@
217 fprintf (file, _(" -z nodelete\t\tMark DSO non-deletable at runtime\n"));
218 fprintf (file, _(" -z nodlopen\t\tMark DSO not available to dlopen\n"));
219 fprintf (file, _(" -z nodump\t\tMark DSO not available to dldump\n"));
220 + fprintf (file, _(" -z noexecheap\tMark executable as not requiring executable heap\n"));
221 fprintf (file, _(" -z noexecstack\tMark executable as not requiring executable stack\n"));
224 --- binutils-2.15.94.0.2.2.orig/ld/ldgram.y 2004-11-22 21:33:32.000000000 +0100
225 +++ binutils-2.15.94.0.2.2/ld/ldgram.y 2005-02-20 13:13:17.499537376 +0100
226 @@ -1073,6 +1073,8 @@
227 $$ = exp_intop (0x6474e550);
228 else if (strcmp (s, "PT_GNU_STACK") == 0)
229 $$ = exp_intop (0x6474e551);
230 + else if (strcmp (s, "PT_PAX_FLAGS") == 0)
231 + $$ = exp_intop (0x65041580);