]> git.pld-linux.org Git - packages/crossppc-binutils.git/blame - binutils-pt_pax_flags.patch
projects / packages / crossppc-binutils.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- updated for 2.17.50.0.2
[packages/crossppc-binutils.git] / binutils-pt_pax_flags.patch
CommitLineData
ac02597b
PS		 1diff -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
4@@ -1266,6 +1266,9 @@
5 /* Should the PT_GNU_RELRO segment be emitted? */
6 bfd_boolean relro;
af80d06b
PS		 7
8+ /* Segment flags for the PT_PAX_FLAGS segment. */
9+ unsigned int pax_flags;
10+
11 /* Symbol version definitions in external objects. */
12 Elf_Internal_Verdef *verdef;
13
888f99f6
JB		 14--- binutils-2.16.91.0.7/bfd/elf.c.orig 2006-03-18 02:13:54.000000000 +0100
15+++ binutils-2.16.91.0.7/bfd/elf.c 2006-03-21 20:15:01.658432000 +0100
16@@ -1085,6 +1085,7 @@
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;
22 }
23 return pt;
24@@ -2606,6 +2607,9 @@
f50e652f
JB		 25 case PT_GNU_RELRO:
26 return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "relro");
af80d06b
PS		 27
28+ case PT_PAX_FLAGS:
29+ return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "pax_flags");
30+
31 default:
139ae873
PS		 32 /* Check for any processor-specific program segment types. */
33 bed = get_elf_backend_data (abfd);
888f99f6 34@@ -3933,6 +3937,20 @@
af80d06b
PS		 35 pm = &m->next;
36 }
37
38+ {
39+ amt = sizeof (struct elf_segment_map);
40+ m = bfd_zalloc (abfd, amt);
41+ if (m == NULL)
42+ goto error_return;
43+ m->next = NULL;
44+ m->p_type = PT_PAX_FLAGS;
45+ m->p_flags = elf_tdata (abfd)->pax_flags;
46+ m->p_flags_valid = 1;
47+
48+ *pm = m;
49+ pm = &m->next;
50+ }
51+
52 free (sections);
53 sections = NULL;
54
888f99f6 55@@ -4665,6 +4683,11 @@
af80d06b
PS		 56 ++segs;
57 }
58
59+ {
60+ /* We need a PT_PAX_FLAGS segment. */
61+ ++segs;
62+ }
63+
64 for (s = abfd->sections; s != NULL; s = s->next)
65 {
66 if ((s->flags & SEC_LOAD) != 0
888f99f6 67@@ -5181,7 +5204,8 @@
ac02597b
PS		 68 5. PT_GNU_STACK segments do not include any sections.
69 6. PT_TLS segment includes only SHF_TLS sections.
139ae873
PS		 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). */
ac02597b
PS		 75 #define INCLUDE_SECTION_IN_SEGMENT(section, segment, bed) \
76 ((((segment->p_paddr \
888f99f6 77@@ -5191,6 +5215,7 @@
af80d06b
PS		 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 \
ac02597b
PS		 85diff -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@@ -4757,17 +4757,31 @@
89 if (!is_elf_hash_table (info->hash))
af80d06b
PS		 90 return TRUE;
91
92+ elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC;
93+
94+ if (info->execheap)
95+ elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT;
96+ else if (info->noexecheap)
97+ elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT;
98+
ac02597b 99 elf_tdata (output_bfd)->relro = info->relro;
af80d06b 100 if (info->execstack)
ac02597b
PS		 101- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
102+ {
103+ elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
104+ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
105+ }
af80d06b 106 else if (info->noexecstack)
ac02597b
PS		 107- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
108+ {
109+ elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
110+ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
111+ }
af80d06b
PS		 112 else
113 {
114 bfd *inputobj;
115 asection *notesec = NULL;
116 int exec = 0;
117
118+ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
119 for (inputobj = info->input_bfds;
120 inputobj;
121 inputobj = inputobj->link_next)
ac02597b 122@@ -4780,7 +4794,11 @@
af80d06b
PS		 123 if (s)
124 {
125 if (s->flags & SEC_CODE)
126- exec = PF_X;
127+ {
128+ elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP;
129+ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
130+ exec = PF_X;
131+ }
132 notesec = s;
133 }
134 else
ac02597b
PS		 135diff -uNr binutils-2.15.94.0.2.2.orig/binutils/readelf.c binutils-2.15.94.0.2.2/binutils/readelf.c
136--- binutils-2.15.94.0.2.2.orig/binutils/readelf.c 2005-02-18 07:14:30.000000000 +0100
137+++ binutils-2.15.94.0.2.2/binutils/readelf.c 2005-02-20 13:13:17.470541784 +0100
138@@ -2293,6 +2293,7 @@
af80d06b 139 return "GNU_EH_FRAME";
ac02597b 140 case PT_GNU_STACK: return "GNU_STACK";
f50e652f 141 case PT_GNU_RELRO: return "GNU_RELRO";
af80d06b
PS		 142+ case PT_PAX_FLAGS: return "PAX_FLAGS";
143
144 default:
145 if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
ac02597b
PS		 146diff -uNr binutils-2.15.94.0.2.2.orig/include/bfdlink.h binutils-2.15.94.0.2.2/include/bfdlink.h
147--- binutils-2.15.94.0.2.2.orig/include/bfdlink.h 2004-11-22 21:33:32.000000000 +0100
148+++ binutils-2.15.94.0.2.2/include/bfdlink.h 2005-02-20 13:13:17.476540872 +0100
149@@ -313,6 +313,14 @@
af80d06b
PS		 150 flags. */
151 unsigned int noexecstack: 1;
152
153+ /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT
154+ flags. */
155+ unsigned int execheap: 1;
156+
157+ /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT
158+ flags. */
159+ unsigned int noexecheap: 1;
160+
ac02597b
PS		 161 /* TRUE if PT_GNU_RELRO segment should be created. */
162 unsigned int relro: 1;
163
164diff -uNr binutils-2.15.94.0.2.2.orig/include/elf/common.h binutils-2.15.94.0.2.2/include/elf/common.h
165--- binutils-2.15.94.0.2.2.orig/include/elf/common.h 2004-11-22 21:33:32.000000000 +0100
166+++ binutils-2.15.94.0.2.2/include/elf/common.h 2005-02-20 13:13:17.482539960 +0100
167@@ -293,12 +293,27 @@
168 #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME /* Solaris uses the same value */
f50e652f
JB		 169 #define PT_GNU_STACK (PT_LOOS + 0x474e551) /* Stack flags */
170 #define PT_GNU_RELRO (PT_LOOS + 0x474e552) /* Read-only after relocation */
ac02597b 171+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580) /* PaX flags */
af80d06b
PS		 172
173 /* Program segment permissions, in program header p_flags field. */
174
175 #define PF_X (1 << 0) /* Segment is executable */
176 #define PF_W (1 << 1) /* Segment is writable */
177 #define PF_R (1 << 2) /* Segment is readable */
178+
179+#define PF_PAGEEXEC (1 << 4) /* Enable PAGEEXEC */
180+#define PF_NOPAGEEXEC (1 << 5) /* Disable PAGEEXEC */
181+#define PF_SEGMEXEC (1 << 6) /* Enable SEGMEXEC */
182+#define PF_NOSEGMEXEC (1 << 7) /* Disable SEGMEXEC */
183+#define PF_MPROTECT (1 << 8) /* Enable MPROTECT */
184+#define PF_NOMPROTECT (1 << 9) /* Disable MPROTECT */
185+#define PF_RANDEXEC (1 << 10) /* Enable RANDEXEC */
186+#define PF_NORANDEXEC (1 << 11) /* Disable RANDEXEC */
187+#define PF_EMUTRAMP (1 << 12) /* Enable EMUTRAMP */
188+#define PF_NOEMUTRAMP (1 << 13) /* Disable EMUTRAMP */
189+#define PF_RANDMMAP (1 << 14) /* Enable RANDMMAP */
190+#define PF_NORANDMMAP (1 << 15) /* Disable RANDMMAP */
191+
192 /* #define PF_MASKOS 0x0F000000 *//* OS-specific reserved bits */
193 #define PF_MASKOS 0x0FF00000 /* New value, Oct 4, 1999 Draft */
194 #define PF_MASKPROC 0xF0000000 /* Processor-specific reserved bits */
ac02597b
PS		 195diff -uNr binutils-2.15.94.0.2.2.orig/ld/emultempl/elf32.em binutils-2.15.94.0.2.2/ld/emultempl/elf32.em
196--- binutils-2.15.94.0.2.2.orig/ld/emultempl/elf32.em 2004-11-22 21:33:33.000000000 +0100
197+++ binutils-2.15.94.0.2.2/ld/emultempl/elf32.em 2005-02-20 13:13:17.492538440 +0100
198@@ -1689,6 +1689,16 @@
199 link_info.noexecstack = TRUE;
200 link_info.execstack = FALSE;
201 }
202+ else if (strcmp (optarg, "execheap") == 0)
af80d06b
PS		 203+ {
204+ link_info.execheap = TRUE;
205+ link_info.noexecheap = FALSE;
206+ }
207+ else if (strcmp (optarg, "noexecheap") == 0)
208+ {
209+ link_info.noexecheap = TRUE;
210+ link_info.execheap = FALSE;
211+ }
ac02597b
PS		 212 else if (strcmp (optarg, "relro") == 0)
213 link_info.relro = TRUE;
214 else if (strcmp (optarg, "norelro") == 0)
215@@ -1729,6 +1739,7 @@
af80d06b
PS		 216 fprintf (file, _(" -z combreloc\t\tMerge dynamic relocs into one section and sort\n"));
217 fprintf (file, _(" -z defs\t\tReport unresolved symbols in object files.\n"));
218 fprintf (file, _(" -z execstack\t\tMark executable as requiring executable stack\n"));
219+ fprintf (file, _(" -z execheap\t\tMark executable as requiring executable heap\n"));
220 fprintf (file, _(" -z initfirst\t\tMark DSO to be initialized first at runtime\n"));
221 fprintf (file, _(" -z interpose\t\tMark object to interpose all DSOs but executable\n"));
222 fprintf (file, _(" -z loadfltr\t\tMark object requiring immediate process\n"));
ac02597b 223@@ -1740,6 +1751,7 @@
af80d06b
PS		 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 noexecstack\tMark executable as not requiring executable stack\n"));
ac02597b 227+ fprintf (file, _(" -z noexecheap\tMark executable as not requiring executable heap\n"));
f50e652f 228 fprintf (file, _(" -z norelro\t\tDon't create RELRO program header\n"));
af80d06b
PS		 229 fprintf (file, _(" -z now\t\tMark object non-lazy runtime binding\n"));
230 fprintf (file, _(" -z origin\t\tMark object requiring immediate \$ORIGIN processing\n\t\t\t at runtime\n"));
ac02597b
PS		 231diff -uNr binutils-2.15.94.0.2.2.orig/ld/ldgram.y binutils-2.15.94.0.2.2/ld/ldgram.y
232--- binutils-2.15.94.0.2.2.orig/ld/ldgram.y 2004-11-22 21:33:32.000000000 +0100
233+++ binutils-2.15.94.0.2.2/ld/ldgram.y 2005-02-20 13:13:17.499537376 +0100
234@@ -1073,6 +1073,8 @@
af80d06b
PS		 235 $$ = exp_intop (0x6474e550);
236 else if (strcmp (s, "PT_GNU_STACK") == 0)
237 $$ = exp_intop (0x6474e551);
238+ else if (strcmp (s, "PT_PAX_FLAGS") == 0)
239+ $$ = exp_intop (0x65041580);
240 else
241 {
242 einfo (_("\
Cross PPC GNU binary utility development utilities - binutils
This page took 0.081987 seconds and 4 git commands to generate.