diff -uNr binutils-2.15.90.0.1.1.orig/bfd/elf-bfd.h binutils-2.15.90.0.1.1/bfd/elf-bfd.h --- binutils-2.15.90.0.1.1.orig/bfd/elf-bfd.h 2004-03-03 21:24:33.000000000 +0100 +++ binutils-2.15.90.0.1.1/bfd/elf-bfd.h 2004-03-17 11:51:20.951912544 +0100 @@ -1225,6 +1225,9 @@ /* Segment flags for the PT_GNU_STACK segment. */ unsigned int stack_flags; + /* Segment flags for the PT_PAX_FLAGS segment. */ + unsigned int pax_flags; + /* Symbol version definitions in external objects. */ Elf_Internal_Verdef *verdef; --- binutils-2.15.91.0.1/bfd/elf.c.orig 2004-05-27 20:26:02.000000000 +0200 +++ binutils-2.15.91.0.1/bfd/elf.c 2004-05-30 02:32:15.280667440 +0200 @@ -996,6 +996,7 @@ case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break; case PT_GNU_STACK: pt = "STACK"; break; case PT_GNU_RELRO: pt = "RELRO"; break; + case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break; default: sprintf (buf, "0x%lx", p->p_type); pt = buf; break; } fprintf (f, "%8s off 0x", pt); @@ -2325,6 +2326,9 @@ case PT_GNU_RELRO: return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "relro"); + case PT_PAX_FLAGS: + return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "pax_flags"); + default: /* Check for any processor-specific program segment types. If no handler for them, default to making "segment" sections. */ @@ -3587,6 +3591,20 @@ pm = &m->next; } + { + amt = sizeof (struct elf_segment_map); + m = bfd_zalloc (abfd, amt); + if (m == NULL) + goto error_return; + m->next = NULL; + m->p_type = PT_PAX_FLAGS; + m->p_flags = elf_tdata (abfd)->pax_flags; + m->p_flags_valid = 1; + + *pm = m; + pm = &m->next; + } + free (sections); sections = NULL; @@ -4245,6 +4263,11 @@ ++segs; } + { + /* We need a PT_PAX_FLAGS segment. */ + ++segs; + } + for (s = abfd->sections; s != NULL; s = s->next) { if ((s->flags & SEC_LOAD) != 0 @@ -4794,6 +4817,7 @@ || IS_COREFILE_NOTE (segment, section)) \ && section->output_section != NULL \ && segment->p_type != PT_GNU_STACK \ + && segment->p_type != PT_PAX_FLAGS \ && (segment->p_type != PT_TLS \ || (section->flags & SEC_THREAD_LOCAL)) \ && (segment->p_type == PT_LOAD \ --- binutils-2.15.91.0.1/bfd/elflink.c.orig 2004-05-27 20:26:02.000000000 +0200 +++ binutils-2.15.91.0.1/bfd/elflink.c 2004-05-30 02:34:22.532322248 +0200 @@ -4628,16 +4628,30 @@ return TRUE; elf_tdata (output_bfd)->relro = info->relro; + elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC; + + if (info->execheap) + elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT; + else if (info->noexecheap) + elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT; + if (info->execstack) + { elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X; + elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP; + } else if (info->noexecstack) + { elf_tdata (output_bfd)->stack_flags = PF_R | PF_W; + elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP; + } else { bfd *inputobj; asection *notesec = NULL; int exec = 0; + elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP; for (inputobj = info->input_bfds; inputobj; inputobj = inputobj->link_next) @@ -4650,7 +4664,11 @@ if (s) { if (s->flags & SEC_CODE) - exec = PF_X; + { + elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP; + elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP; + exec = PF_X; + } notesec = s; } else --- binutils-2.15.91.0.1/binutils/readelf.c.orig 2004-05-27 20:26:02.000000000 +0200 +++ binutils-2.15.91.0.1/binutils/readelf.c 2004-05-30 02:34:52.746728960 +0200 @@ -2190,6 +2190,7 @@ return "GNU_EH_FRAME"; case PT_GNU_STACK: return "STACK"; case PT_GNU_RELRO: return "GNU_RELRO"; + case PT_PAX_FLAGS: return "PAX_FLAGS"; default: if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC)) diff -uNr binutils-2.15.90.0.1.1.orig/include/bfdlink.h binutils-2.15.90.0.1.1/include/bfdlink.h --- binutils-2.15.90.0.1.1.orig/include/bfdlink.h 2004-01-14 22:07:51.000000000 +0100 +++ binutils-2.15.90.0.1.1/include/bfdlink.h 2004-03-17 11:51:21.109888528 +0100 @@ -302,6 +302,14 @@ flags. */ unsigned int noexecstack: 1; + /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT + flags. */ + unsigned int execheap: 1; + + /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT + flags. */ + unsigned int noexecheap: 1; + /* What to do with unresolved symbols in an object file. When producing static binaries the default is GENERATE_ERROR. When producing dynamic binaries the default is IGNORE. The --- binutils-2.15.91.0.1/include/elf/common.h.orig 2004-05-27 20:26:04.000000000 +0200 +++ binutils-2.15.91.0.1/include/elf/common.h 2004-05-30 02:36:25.633608008 +0200 @@ -291,12 +291,27 @@ #define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550) /* Frame unwind information */ #define PT_GNU_STACK (PT_LOOS + 0x474e551) /* Stack flags */ #define PT_GNU_RELRO (PT_LOOS + 0x474e552) /* Read-only after relocation */ +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580) /* Program segment permissions, in program header p_flags field. */ #define PF_X (1 << 0) /* Segment is executable */ #define PF_W (1 << 1) /* Segment is writable */ #define PF_R (1 << 2) /* Segment is readable */ + +#define PF_PAGEEXEC (1 << 4) /* Enable PAGEEXEC */ +#define PF_NOPAGEEXEC (1 << 5) /* Disable PAGEEXEC */ +#define PF_SEGMEXEC (1 << 6) /* Enable SEGMEXEC */ +#define PF_NOSEGMEXEC (1 << 7) /* Disable SEGMEXEC */ +#define PF_MPROTECT (1 << 8) /* Enable MPROTECT */ +#define PF_NOMPROTECT (1 << 9) /* Disable MPROTECT */ +#define PF_RANDEXEC (1 << 10) /* Enable RANDEXEC */ +#define PF_NORANDEXEC (1 << 11) /* Disable RANDEXEC */ +#define PF_EMUTRAMP (1 << 12) /* Enable EMUTRAMP */ +#define PF_NOEMUTRAMP (1 << 13) /* Disable EMUTRAMP */ +#define PF_RANDMMAP (1 << 14) /* Enable RANDMMAP */ +#define PF_NORANDMMAP (1 << 15) /* Disable RANDMMAP */ + /* #define PF_MASKOS 0x0F000000 *//* OS-specific reserved bits */ #define PF_MASKOS 0x0FF00000 /* New value, Oct 4, 1999 Draft */ #define PF_MASKPROC 0xF0000000 /* Processor-specific reserved bits */ --- binutils-2.15.91.0.1/ld/emultempl/elf32.em.orig 2004-05-27 20:26:05.000000000 +0200 +++ binutils-2.15.91.0.1/ld/emultempl/elf32.em 2004-05-30 02:37:57.317669912 +0200 @@ -1694,6 +1694,16 @@ link_info.relro = TRUE; else if (strcmp (optarg, "norelro") == 0) link_info.relro = FALSE; + else if (strcmp (optarg, "execheap") == 0) + { + link_info.execheap = TRUE; + link_info.noexecheap = FALSE; + } + else if (strcmp (optarg, "noexecheap") == 0) + { + link_info.noexecheap = TRUE; + link_info.execheap = FALSE; + } /* What about the other Solaris -z options? FIXME. */ break; EOF @@ -1730,6 +1740,7 @@ fprintf (file, _(" -z combreloc\t\tMerge dynamic relocs into one section and sort\n")); fprintf (file, _(" -z defs\t\tReport unresolved symbols in object files.\n")); fprintf (file, _(" -z execstack\t\tMark executable as requiring executable stack\n")); + fprintf (file, _(" -z execheap\t\tMark executable as requiring executable heap\n")); fprintf (file, _(" -z initfirst\t\tMark DSO to be initialized first at runtime\n")); fprintf (file, _(" -z interpose\t\tMark object to interpose all DSOs but executable\n")); fprintf (file, _(" -z loadfltr\t\tMark object requiring immediate process\n")); @@ -1741,6 +1752,7 @@ fprintf (file, _(" -z nodlopen\t\tMark DSO not available to dlopen\n")); fprintf (file, _(" -z nodump\t\tMark DSO not available to dldump\n")); fprintf (file, _(" -z noexecstack\tMark executable as not requiring executable stack\n")); + fprintf (file, _(" -z noexecheap\t\tMark executable as not requiring executable heap\n")); fprintf (file, _(" -z norelro\t\tDon't create RELRO program header\n")); fprintf (file, _(" -z now\t\tMark object non-lazy runtime binding\n")); fprintf (file, _(" -z origin\t\tMark object requiring immediate \$ORIGIN processing\n\t\t\t at runtime\n")); diff -uNr binutils-2.15.90.0.1.1.orig/ld/ldgram.y binutils-2.15.90.0.1.1/ld/ldgram.y --- binutils-2.15.90.0.1.1.orig/ld/ldgram.y 2004-03-03 21:24:34.000000000 +0100 +++ binutils-2.15.90.0.1.1/ld/ldgram.y 2004-03-17 11:51:21.123886400 +0100 @@ -1019,6 +1019,8 @@ $$ = exp_intop (0x6474e550); else if (strcmp (s, "PT_GNU_STACK") == 0) $$ = exp_intop (0x6474e551); + else if (strcmp (s, "PT_PAX_FLAGS") == 0) + $$ = exp_intop (0x65041580); else { einfo (_("\