tjh.dev
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
3@@ -1266,6 +1266,9 @@
4 /* Should the PT_GNU_RELRO segment be emitted? */
5 bfd_boolean relro;
6
7+ /* Segment flags for the PT_PAX_FLAGS segment. */
8+ unsigned int pax_flags;
9+
10 /* Symbol version definitions in external objects. */
11 Elf_Internal_Verdef *verdef;
12
13--- binutils-2.17.50.0.18/bfd/elf.c.orig 2007-08-01 11:12:02.000000000 -0400
14+++ binutils-2.17.50.0.18/bfd/elf.c 2007-08-01 14:27:36.086986774 -0400
15@@ -1085,6 +1085,7 @@
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;
21 }
22 return pt;
23@@ -2346,6 +2347,9 @@
24 case PT_GNU_RELRO:
25 return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "relro");
26
27+ case PT_PAX_FLAGS:
28+ return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "pax_flags");
29+
30 default:
31 /* Check for any processor-specific program segment types. */
32 bed = get_elf_backend_data (abfd);
33@@ -3326,6 +3330,11 @@
34 ++segs;
35 }
36
37+ {
38+ /* We need a PT_PAX_FLAGS segment. */
39+ ++segs;
40+ }
41+
42 for (s = abfd->sections; s != NULL; s = s->next)
43 {
44 if ((s->flags & SEC_LOAD) != 0
45@@ -3945,6 +3954,20 @@
46 pm = &m->next;
47 }
48
49+ {
50+ amt = sizeof (struct elf_segment_map);
51+ m = bfd_zalloc (abfd, amt);
52+ if (m == NULL)
53+ goto error_return;
54+ m->next = NULL;
55+ m->p_type = PT_PAX_FLAGS;
56+ m->p_flags = elf_tdata (abfd)->pax_flags;
57+ m->p_flags_valid = 1;
58+
59+ *pm = m;
60+ pm = &m->next;
61+ }
62+
63 free (sections);
64 elf_tdata (abfd)->segment_map = mfirst;
65 }
66@@ -5129,7 +5152,8 @@
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 IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed) \
75 ((((segment->p_paddr \
76@@ -5138,6 +5162,7 @@
77 && (section->flags & SEC_ALLOC) != 0) \
78 || IS_COREFILE_NOTE (segment, section)) \
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.23.52.0.1/bfd/elflink.c.orig 2013-02-27 21:28:03.000000000 +0100
85+++ binutils-2.23.52.0.1/bfd/elflink.c 2013-03-01 17:32:44.922717879 +0100
86@@ -5764,18 +5764,32 @@
87 && ! (*bed->elf_backend_always_size_sections) (output_bfd, info))
88 return FALSE;
89
90+ elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC;
91+
92+ if (info->execheap)
93+ elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT;
94+ else if (info->noexecheap)
95+ elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT;
96+
97 /* Determine any GNU_STACK segment requirements, after the backend
98 has had a chance to set a default segment size. */
99 if (info->execstack)
100+ {
101 elf_stack_flags (output_bfd) = PF_R | PF_W | PF_X;
102+ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
103+ }
104 else if (info->noexecstack)
105+ {
106 elf_stack_flags (output_bfd) = PF_R | PF_W;
107+ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
108+ }
109 else
110 {
111 bfd *inputobj;
112 asection *notesec = NULL;
113 int exec = 0;
114
115+ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
116 for (inputobj = info->input_bfds;
117 inputobj;
118 inputobj = inputobj->link_next)
119@@ -5789,7 +5803,11 @@
120 if (s)
121 {
122 if (s->flags & SEC_CODE)
123- exec = PF_X;
124+ {
125+ elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP;
126+ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
127+ exec = PF_X;
128+ }
129 notesec = s;
130 }
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";
139
140 default:
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
144@@ -313,6 +313,14 @@
145 flags. */
146 unsigned int noexecstack: 1;
147
148+ /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT
149+ flags. */
150+ unsigned int execheap: 1;
151+
152+ /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT
153+ flags. */
154+ unsigned int noexecheap: 1;
155+
156 /* TRUE if PT_GNU_RELRO segment should be created. */
157 unsigned int relro: 1;
158
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@@ -423,6 +423,7 @@
162 #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME /* Solaris uses the same value */
163 #define PT_GNU_STACK (PT_LOOS + 0x474e551) /* Stack flags */
164 #define PT_GNU_RELRO (PT_LOOS + 0x474e552) /* Read-only after relocation */
165+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580) /* PaX flags */
166
167 /* Program segment permissions, in program header p_flags field. */
168
169@@ -433,6 +434,19 @@
170 #define PF_MASKOS 0x0FF00000 /* New value, Oct 4, 1999 Draft */
171 #define PF_MASKPROC 0xF0000000 /* Processor-specific reserved bits */
172
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 */
185+
186 /* Values for section header, sh_type field. */
187
188 #define SHT_NULL 0 /* Section header table entry unused */
189--- binutils-2.18.50.0.1/ld/emultempl/elf32.em.orig 2007-09-08 19:34:12.000000000 +0200
190+++ binutils-2.18.50.0.1/ld/emultempl/elf32.em 2007-09-15 21:41:35.688212063 +0200
191@@ -2139,6 +2139,16 @@
192 link_info.noexecstack = TRUE;
193 link_info.execstack = FALSE;
194 }
195+ else if (strcmp (optarg, "execheap") == 0)
196+ {
197+ link_info.execheap = TRUE;
198+ link_info.noexecheap = FALSE;
199+ }
200+ else if (strcmp (optarg, "noexecheap") == 0)
201+ {
202+ link_info.noexecheap = TRUE;
203+ link_info.execheap = FALSE;
204+ }
205 EOF
206
207 if test -n "$COMMONPAGESIZE"; then
208--- binutils-2.15.94.0.2.2.orig/ld/ldgram.y 2004-11-22 21:33:32.000000000 +0100
209+++ binutils-2.15.94.0.2.2/ld/ldgram.y 2005-02-20 13:13:17.499537376 +0100
210@@ -1073,6 +1073,8 @@
211 $$ = exp_intop (0x6474e550);
212 else if (strcmp (s, "PT_GNU_STACK") == 0)
213 $$ = exp_intop (0x6474e551);
214+ else if (strcmp (s, "PT_PAX_FLAGS") == 0)
215+ $$ = exp_intop (0x65041580);
216 else
217 {
218 einfo (_("\
219--- binutils-2.26/ld/lexsup.c.orig 2015-11-13 09:27:42.000000000 +0100
220+++ binutils-2.26/ld/lexsup.c 2016-01-26 21:08:41.787138458 +0100
221@@ -1793,8 +1793,12 @@
222 fprintf (file, _("\
223 -z muldefs Allow multiple definitions\n"));
224 fprintf (file, _("\
225+ -z execheap Mark executable as requiring executable heap\n"));
226+ fprintf (file, _("\
227 -z execstack Mark executable as requiring executable stack\n"));
228 fprintf (file, _("\
229+ -z noexecheap Mark executable as not requiring executable heap\n"));
230+ fprintf (file, _("\
231 -z noexecstack Mark executable as not requiring executable stack\n"));
232 }
233