Maverick pull request for cs-limit nx-emulation refresh

[Leann Ogasawara]

This is just a refresh/update of patches we're already carrying.
Applied to Maverick master.

Thanks,
Leann

On Tue, 2010-05-25 at 15:19 -0700, Kees Cook wrote:
> The following changes since commit 931fecb7a2d93bd931cf07bb2367bb545a3d557f:
>   Leann Ogasawara (1):
>         UBUNTU: Ubuntu-2.6.34-4.11
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/kees/ubuntu-maverick.git master
> 
> Kees Cook (6):
>       Revert "UBUNTU: SAUCE: x86: brk away from exec rand area"
>       Revert "UBUNTU: SAUCE: [um] Don't use nx_enabled under UML"
>       Revert "UBUNTU: SAUCE: [x86] implement cs-limit nx-emulation for ia32"
>       UBUNTU: SAUCE: x86: implement cs-limit nx-emulation for ia32
>       UBUNTU: SAUCE: x86: more tightly confine cs-limit nx-emulation to ia32 only
>       UBUNTU: SAUCE: x86: brk away from exec rand area
> 
> Loïc Minier (1):
>       UBUNTU: SAUCE: [um] Don't use nx_enabled under UML
> 
>  arch/x86/include/asm/paravirt_types.h |    2 +-
>  arch/x86/kernel/cpu/common.c          |    7 ++++-
>  arch/x86/kernel/process.c             |    2 +-
>  arch/x86/kernel/process_32.c          |    6 +++-
>  arch/x86/kernel/traps.c               |   40 +++++++++++++++++++++++---------
>  arch/x86/mm/mmap.c                    |    9 +++++-
>  arch/x86/mm/setup_nx.c                |   14 +++++++++++
>  arch/x86/mm/tlb.c                     |    4 ++-
>  fs/binfmt_elf.c                       |   22 ++++++++++++++----
>  include/linux/mm.h                    |    8 ++----
>  include/linux/sched.h                 |    6 +++++
>  kernel/sysctl.c                       |   28 +++++++++++++++++++++++
>  mm/mmap.c                             |   12 +++++----
>  13 files changed, 125 insertions(+), 35 deletions(-)
> 
> -- 
> Kees Cook
> Ubuntu Security Team
>