yann@2088: 
yann@2088: 
yann@2088: diff -durN binutils-2.20.1.orig/bfd/elf-bfd.h binutils-2.20.1/bfd/elf-bfd.h
yann@2088: --- binutils-2.20.1.orig/bfd/elf-bfd.h	2009-09-10 13:47:12.000000000 +0200
yann@2088: +++ binutils-2.20.1/bfd/elf-bfd.h	2010-08-17 19:32:11.000000000 +0200
yann@2088: @@ -1531,6 +1531,9 @@
yann@1614:    /* Segment flags for the PT_GNU_STACK segment.  */
yann@1614:    unsigned int stack_flags;
yann@1614:  
yann@1614: +  /* Segment flags for the PT_PAX_FLAGS segment.  */
yann@1614: +  unsigned int pax_flags;
yann@1614: +
yann@1614:    /* Symbol version definitions in external objects.  */
yann@1614:    Elf_Internal_Verdef *verdef;
yann@1614:  
yann@2088: diff -durN binutils-2.20.1.orig/bfd/elf.c binutils-2.20.1/bfd/elf.c
yann@2088: --- binutils-2.20.1.orig/bfd/elf.c	2009-09-10 13:47:12.000000000 +0200
yann@2088: +++ binutils-2.20.1/bfd/elf.c	2010-08-17 19:32:11.000000000 +0200
yann@2088: @@ -1083,6 +1083,7 @@
yann@1614:      case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
yann@1614:      case PT_GNU_STACK: pt = "STACK"; break;
yann@1614:      case PT_GNU_RELRO: pt = "RELRO"; break;
yann@1614: +    case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break;
yann@1614:      default: pt = NULL; break;
yann@1614:      }
yann@1614:    return pt;
yann@2088: @@ -2396,6 +2397,9 @@
yann@1614:      case PT_GNU_RELRO:
yann@1614:        return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "relro");
yann@1614:  
yann@1614: +    case PT_PAX_FLAGS:
yann@1614: +      return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "pax_flags");
yann@1614: +
yann@1614:      default:
yann@1614:        /* Check for any processor-specific program segment types.  */
yann@1614:        bed = get_elf_backend_data (abfd);
yann@2088: @@ -3413,6 +3417,11 @@
yann@1614:        ++segs;
yann@1614:      }
yann@1614:  
yann@1614: +    {
yann@1614: +      /* We need a PT_PAX_FLAGS segment.  */
yann@1614: +      ++segs;
yann@1614: +    }
yann@1614: +
yann@1614:    for (s = abfd->sections; s != NULL; s = s->next)
yann@1614:      {
yann@1614:        if ((s->flags & SEC_LOAD) != 0
yann@2088: @@ -3994,6 +4003,20 @@
yann@1614:  	    }
yann@1614:  	}
yann@1614:  
yann@1614: +    {
yann@1614: +      amt = sizeof (struct elf_segment_map);
yann@1614: +      m = bfd_zalloc (abfd, amt);
yann@1614: +      if (m == NULL)
yann@1614: +	goto error_return;
yann@1614: +      m->next = NULL;
yann@1614: +      m->p_type = PT_PAX_FLAGS;
yann@1614: +      m->p_flags = elf_tdata (abfd)->pax_flags;
yann@1614: +      m->p_flags_valid = 1;
yann@1614: +
yann@1614: +      *pm = m;
yann@1614: +      pm = &m->next;
yann@1614: +    }
yann@1614: +
yann@1614:        free (sections);
yann@1614:        elf_tdata (abfd)->segment_map = mfirst;
yann@1614:      }
yann@2088: @@ -5198,7 +5221,8 @@
yann@1614:         6. PT_TLS segment includes only SHF_TLS sections.
yann@1614:         7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
yann@1614:         8. PT_DYNAMIC should not contain empty sections at the beginning
yann@1614: -	  (with the possible exception of .dynamic).  */
yann@1614: +	  (with the possible exception of .dynamic).
yann@1614: +       9. PT_PAX_FLAGS segments do not include any sections.  */
yann@1614:  #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed)		\
yann@1614:    ((((segment->p_paddr							\
yann@1614:        ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr)	\
yann@2088: @@ -5206,6 +5230,7 @@
yann@1614:       && (section->flags & SEC_ALLOC) != 0)				\
yann@1614:      || IS_NOTE (segment, section))					\
yann@1614:     && segment->p_type != PT_GNU_STACK					\
yann@1614: +   && segment->p_type != PT_PAX_FLAGS					\
yann@1614:     && (segment->p_type != PT_TLS					\
yann@1614:         || (section->flags & SEC_THREAD_LOCAL))				\
yann@1614:     && (segment->p_type == PT_LOAD					\
yann@2088: diff -durN binutils-2.20.1.orig/bfd/elflink.c binutils-2.20.1/bfd/elflink.c
yann@2088: --- binutils-2.20.1.orig/bfd/elflink.c	2009-09-10 13:47:12.000000000 +0200
yann@2088: +++ binutils-2.20.1/bfd/elflink.c	2010-08-17 19:32:11.000000000 +0200
yann@2088: @@ -5469,16 +5469,30 @@
yann@1614:      return TRUE;
yann@1614:  
yann@1614:    bed = get_elf_backend_data (output_bfd);
yann@1614: +
yann@1614: +  elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC;
yann@1614: +  if (info->execheap)
yann@1614: +    elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT;
yann@1614: +  else if (info->noexecheap)
yann@1614: +    elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT;
yann@1614: +
yann@1614:    if (info->execstack)
yann@1614: -    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
yann@1614: +    {
yann@1614: +      elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
yann@1614: +      elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
yann@1614: +    }
yann@1614:    else if (info->noexecstack)
yann@1614: -    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
yann@1614: +    {
yann@1614: +      elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
yann@1614: +      elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
yann@1614: +    }
yann@1614:    else
yann@1614:      {
yann@1614:        bfd *inputobj;
yann@1614:        asection *notesec = NULL;
yann@1614:        int exec = 0;
yann@1614:  
yann@1614: +      elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
yann@1614:        for (inputobj = info->input_bfds;
yann@1614:  	   inputobj;
yann@1614:  	   inputobj = inputobj->link_next)
yann@2088: @@ -5491,7 +5505,11 @@
yann@1614:  	  if (s)
yann@1614:  	    {
yann@1614:  	      if (s->flags & SEC_CODE)
yann@1614: -		exec = PF_X;
yann@1614: +		{
yann@1614: +		  elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP;
yann@1614: +		  elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
yann@1614: +		  exec = PF_X;
yann@1614: +		}
yann@1614:  	      notesec = s;
yann@1614:  	    }
yann@1614:  	  else if (bed->default_execstack)
yann@2088: diff -durN binutils-2.20.1.orig/binutils/readelf.c binutils-2.20.1/binutils/readelf.c
yann@2088: --- binutils-2.20.1.orig/binutils/readelf.c	2010-01-14 11:48:23.000000000 +0100
yann@2088: +++ binutils-2.20.1/binutils/readelf.c	2010-08-17 19:32:11.000000000 +0200
yann@2088: @@ -2569,6 +2569,7 @@
yann@1614:  			return "GNU_EH_FRAME";
yann@1614:      case PT_GNU_STACK:	return "GNU_STACK";
yann@1614:      case PT_GNU_RELRO:  return "GNU_RELRO";
yann@1614: +    case PT_PAX_FLAGS:  return "PAX_FLAGS";
yann@1614:  
yann@1614:      default:
yann@1614:        if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
yann@2088: diff -durN binutils-2.20.1.orig/include/bfdlink.h binutils-2.20.1/include/bfdlink.h
yann@2088: --- binutils-2.20.1.orig/include/bfdlink.h	2009-09-10 13:47:30.000000000 +0200
yann@2088: +++ binutils-2.20.1/include/bfdlink.h	2010-08-17 19:32:11.000000000 +0200
yann@2088: @@ -321,6 +321,14 @@
yann@1614:    /* TRUE if PT_GNU_RELRO segment should be created.  */
yann@1614:    unsigned int relro: 1;
yann@1614:  
yann@1614: +  /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT
yann@1614: +     flags.  */
yann@1614: +  unsigned int execheap: 1;
yann@1614: +
yann@1614: +  /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT
yann@1614: +     flags.  */
yann@1614: +  unsigned int noexecheap: 1;
yann@1614: +
yann@1614:    /* TRUE if we should warn when adding a DT_TEXTREL to a shared object.  */
yann@1614:    unsigned int warn_shared_textrel: 1;
yann@1614:  
yann@2088: diff -durN binutils-2.20.1.orig/include/elf/common.h binutils-2.20.1/include/elf/common.h
yann@2088: --- binutils-2.20.1.orig/include/elf/common.h	2009-08-09 15:42:26.000000000 +0200
yann@2088: +++ binutils-2.20.1/include/elf/common.h	2010-08-17 19:32:11.000000000 +0200
yann@1614: @@ -422,6 +422,7 @@
yann@1614:  #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME      /* Solaris uses the same value */
yann@1614:  #define PT_GNU_STACK	(PT_LOOS + 0x474e551) /* Stack flags */
yann@1614:  #define PT_GNU_RELRO	(PT_LOOS + 0x474e552) /* Read-only after relocation */
yann@1614: +#define PT_PAX_FLAGS	(PT_LOOS + 0x5041580) /* PaX flags */
yann@1614:  
yann@1614:  /* Program segment permissions, in program header p_flags field.  */
yann@1614:  
yann@1614: @@ -432,6 +433,21 @@
yann@1614:  #define PF_MASKOS	0x0FF00000	/* New value, Oct 4, 1999 Draft */
yann@1614:  #define PF_MASKPROC	0xF0000000	/* Processor-specific reserved bits */
yann@1614:  
yann@1614: +/* Flags to control PaX behavior.  */
yann@1614: +
yann@1614: +#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
yann@1614: +#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
yann@1614: +#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
yann@1614: +#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
yann@1614: +#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
yann@1614: +#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
yann@1614: +#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
yann@1614: +#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
yann@1614: +#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
yann@1614: +#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
yann@1614: +#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
yann@1614: +#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
yann@1614: +
yann@1614:  /* Values for section header, sh_type field.  */
yann@1614:  
yann@1614:  #define SHT_NULL	0		/* Section header table entry unused */
yann@2088: diff -durN binutils-2.20.1.orig/ld/emultempl/elf32.em binutils-2.20.1/ld/emultempl/elf32.em
yann@2088: --- binutils-2.20.1.orig/ld/emultempl/elf32.em	2010-08-17 19:32:09.000000000 +0200
yann@2088: +++ binutils-2.20.1/ld/emultempl/elf32.em	2010-08-17 19:32:11.000000000 +0200
yann@2088: @@ -2165,6 +2165,16 @@
yann@1614:  	  link_info.noexecstack = TRUE;
yann@1614:  	  link_info.execstack = FALSE;
yann@1614:  	}
yann@1614: +      else if (strcmp (optarg, "execheap") == 0)
yann@1614: +	{
yann@1614: +	  link_info.execheap = TRUE;
yann@1614: +	  link_info.noexecheap = FALSE;
yann@1614: +	}
yann@1614: +      else if (strcmp (optarg, "noexecheap") == 0)
yann@1614: +	{
yann@1614: +	  link_info.noexecheap = TRUE;
yann@1614: +	  link_info.execheap = FALSE;
yann@1614: +	}
yann@1614:  EOF
yann@1614:  
yann@1614:    if test -n "$COMMONPAGESIZE"; then
yann@2088: @@ -2243,6 +2253,8 @@
yann@1614:    fprintf (file, _("\
yann@1614:    -z execstack                Mark executable as requiring executable stack\n"));
yann@1614:    fprintf (file, _("\
yann@1614: +  -z execheap                 Mark executable as requiring executable heap\n"));
yann@1614: +  fprintf (file, _("\
yann@1614:    -z initfirst                Mark DSO to be initialized first at runtime\n"));
yann@1614:    fprintf (file, _("\
yann@1614:    -z interpose                Mark object to interpose all DSOs but executable\n"));
yann@2088: @@ -2266,6 +2278,8 @@
yann@1614:    -z nodump                   Mark DSO not available to dldump\n"));
yann@1614:    fprintf (file, _("\
yann@1614:    -z noexecstack              Mark executable as not requiring executable stack\n"));
yann@1614: +  fprintf (file, _("\
yann@1614: +  -z noexecheap               Mark executable as not requiring executable heap\n"));
yann@1614:  EOF
yann@1614:  
yann@1614:    if test -n "$COMMONPAGESIZE"; then
yann@2088: diff -durN binutils-2.20.1.orig/ld/ldgram.y binutils-2.20.1/ld/ldgram.y
yann@2088: --- binutils-2.20.1.orig/ld/ldgram.y	2009-09-02 09:25:35.000000000 +0200
yann@2088: +++ binutils-2.20.1/ld/ldgram.y	2010-08-17 19:32:11.000000000 +0200
yann@2088: @@ -1116,6 +1116,8 @@
yann@1614:  			    $$ = exp_intop (0x6474e550);
yann@1614:  			  else if (strcmp (s, "PT_GNU_STACK") == 0)
yann@1614:  			    $$ = exp_intop (0x6474e551);
yann@1614: +			  else if (strcmp (s, "PT_PAX_FLAGS") == 0)
yann@1614: +			    $$ = exp_intop (0x65041580);
yann@1614:  			  else
yann@1614:  			    {
yann@1614:  			      einfo (_("\