ubmitted By: Robert Connolly (ashes) Date: 2004-10-16 Initial Package Version: binutils-2.15.92.0.2 Upstream Status: Not submitted - PaX specific; will not be accepted upstream. Origin: http://pax.grsecurity.net/\ binutils-2.15.91.0.2-pt-pax-flags-200410091215.patch Description: This is needed for Grsec. http://www.grsecurity.net/ Also see: http://www.linuxfromscratch.org/hlfs/ diff -Nurp binutils-2.15.92.0.2-old/bfd/elf-bfd.h binutils-2.15.92.0.2-pax/bfd/elf-bfd.h --- binutils-2.15.92.0.2-old/bfd/elf-bfd.h 2004-09-27 22:46:06.000000000 +0200 +++ binutils-2.15.92.0.2-pax/bfd/elf-bfd.h 2004-10-09 14:06:15.000000000 +0200 @@ -1261,6 +1261,9 @@ struct elf_obj_tdata /* Should the PT_GNU_RELRO segment be emitted? */ bfd_boolean relro; + /* Segment flags for the PT_PAX_FLAGS segment. */ + unsigned int pax_flags; + /* Symbol version definitions in external objects. */ Elf_Internal_Verdef *verdef; diff -Nurp binutils-2.15.92.0.2-old/bfd/elf.c binutils-2.15.92.0.2-pax/bfd/elf.c --- binutils-2.15.92.0.2-old/bfd/elf.c 2004-09-27 22:46:06.000000000 +0200 +++ binutils-2.15.92.0.2-pax/bfd/elf.c 2004-10-09 14:06:15.000000000 +0200 @@ -1043,6 +1043,7 @@ _bfd_elf_print_private_bfd_data (bfd *ab 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); @@ -2368,6 +2369,9 @@ bfd_section_from_phdr (bfd *abfd, Elf_In 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. */ @@ -3688,6 +3692,20 @@ map_sections_to_segments (bfd *abfd) 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; @@ -4383,6 +4401,11 @@ get_program_header_size (bfd *abfd) ++segs; } + { + /* We need a PT_PAX_FLAGS segment. */ + ++segs; + } + for (s = abfd->sections; s != NULL; s = s->next) { if ((s->flags & SEC_LOAD) != 0 @@ -4926,7 +4949,8 @@ copy_private_bfd_data (bfd *ibfd, bfd *o 4. The section has not already been allocated to a previous segment. 5. PT_GNU_STACK segments do not include any sections. 6. PT_TLS segment includes only SHF_TLS sections. - 7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments. */ + 7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments. + 8. PT_PAX_FLAGS segments do not include any sections. */ #define INCLUDE_SECTION_IN_SEGMENT(section, segment, bed) \ ((((segment->p_paddr \ ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr) \ @@ -4935,6 +4959,7 @@ copy_private_bfd_data (bfd *ibfd, bfd *o || 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 \ diff -Nurp binutils-2.15.92.0.2-old/bfd/elflink.c binutils-2.15.92.0.2-pax/bfd/elflink.c --- binutils-2.15.92.0.2-old/bfd/elflink.c 2004-09-27 22:46:06.000000000 +0200 +++ binutils-2.15.92.0.2-pax/bfd/elflink.c 2004-10-09 14:06:15.000000000 +0200 @@ -4665,17 +4665,31 @@ bfd_elf_size_dynamic_sections (bfd *outp if (!is_elf_hash_table (info->hash)) return TRUE; + 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; + elf_tdata (output_bfd)->relro = info->relro; if (info->execstack) - elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X; + { + 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)->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) @@ -4688,7 +4702,11 @@ bfd_elf_size_dynamic_sections (bfd *outp 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 diff -Nurp binutils-2.15.92.0.2-old/binutils/readelf.c binutils-2.15.92.0.2-pax/binutils/readelf.c --- binutils-2.15.92.0.2-old/binutils/readelf.c 2004-09-27 22:46:07.000000000 +0200 +++ binutils-2.15.92.0.2-pax/binutils/readelf.c 2004-10-09 14:06:15.000000000 +0200 @@ -2264,6 +2264,7 @@ get_segment_type (unsigned long p_type) return "GNU_EH_FRAME"; case PT_GNU_STACK: return "GNU_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 -Nurp binutils-2.15.92.0.2-old/include/bfdlink.h binutils-2.15.92.0.2-pax/include/bfdlink.h --- binutils-2.15.92.0.2-old/include/bfdlink.h 2004-09-27 22:46:07.000000000 +0200 +++ binutils-2.15.92.0.2-pax/include/bfdlink.h 2004-10-09 14:06:15.000000000 +0200 @@ -305,6 +305,14 @@ struct bfd_link_info 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; + /* TRUE if PT_GNU_RELRO segment should be created. */ unsigned int relro: 1; diff -Nurp binutils-2.15.92.0.2-old/include/elf/common.h binutils-2.15.92.0.2-pax/include/elf/common.h --- binutils-2.15.92.0.2-old/include/elf/common.h 2004-07-28 06:36:10.000000000 +0200 +++ binutils-2.15.92.0.2-pax/include/elf/common.h 2004-10-09 14:06:15.000000000 +0200 @@ -292,12 +292,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) /* PaX flags */ /* 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 */ diff -Nurp binutils-2.15.92.0.2-old/ld/emultempl/elf32.em binutils-2.15.92.0.2-pax/ld/emultempl/elf32.em --- binutils-2.15.92.0.2-old/ld/emultempl/elf32.em 2004-07-28 06:36:11.000000000 +0200 +++ binutils-2.15.92.0.2-pax/ld/emultempl/elf32.em 2004-10-09 14:06:15.000000000 +0200 @@ -1732,6 +1732,16 @@ cat >>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <