[pull request] [natty] nx-emulation and associated ASLR

[Kees Cook]

The following changes since commit 9a439dae4a0235fb03d5cbfa469530f18317e60a:

  UBUNTU: [Config] Use correct be2iscsi module name in d-i/modules/scsi-modules (2010-11-05 09:14:40 -0600)

are available in the git repository at:
  git://kernel.ubuntu.com/kees/ubuntu-natty.git master

Kees Cook (4):
      nx-emu: drop exec-shield sysctl, merge with disable_nx
      nx-emu: standardize boottime message prefix
      exec-randomization: brk away from exec rand area
      UBUNTU: SAUCE: nx-emu: use upstream ASLR when possible

Roland McGrath (2):
      i386: NX emulation
      mmap randomization for executable mappings on 32-bit

 arch/x86/include/asm/desc.h           |   25 ++++++
 arch/x86/include/asm/mmu.h            |    7 ++
 arch/x86/include/asm/paravirt.h       |    6 ++
 arch/x86/include/asm/paravirt_types.h |    3 +
 arch/x86/kernel/cpu/common.c          |   16 ++++
 arch/x86/kernel/paravirt.c            |    3 +
 arch/x86/kernel/process.c             |   12 +++-
 arch/x86/kernel/process_32.c          |   48 ++++++++++++
 arch/x86/kernel/traps.c               |  131 ++++++++++++++++++++++++++++++--
 arch/x86/mm/mmap.c                    |    6 ++
 arch/x86/mm/setup_nx.c                |   13 +++-
 arch/x86/mm/tlb.c                     |    7 ++
 arch/x86/vdso/vdso32-setup.c          |    2 +-
 arch/x86/xen/enlighten.c              |   21 +++++
 fs/binfmt_elf.c                       |    9 ++
 include/linux/mm.h                    |    8 ++-
 include/linux/mm_types.h              |    3 +
 include/linux/sched.h                 |    7 ++
 mm/mmap.c                             |  119 ++++++++++++++++++++++++++++--
 mm/mprotect.c                         |   10 ++-
 mm/mremap.c                           |    4 +-
 21 files changed, 437 insertions(+), 23 deletions(-)


-- 
Kees Cook
Ubuntu Security Team