[Oneiric][pull request] Update/consolidate nx-emu
Leann Ogasawara
leann.ogasawara at canonical.com
Wed May 25 15:17:05 UTC 2011
Applied to Oneiric master-next.
Thanks,
Leann
On Tue, 2011-05-24 at 14:04 -0700, Kees Cook wrote:
> The following changes since commit 1e9ed812fef72843c4cbd4a1dd5c248aff332184:
>
> UBUNTU: Ubuntu-2.6.39-3.9 (2011-05-20 09:53:38 +0100)
>
> are available in the git repository at:
> git://kernel.ubuntu.com/kees/ubuntu-oneiric.git master
>
> Ingo Molnar (2):
> UBUNTU: ubuntu: nx-emu - i386: NX emulation
> UBUNTU: ubuntu: nx-emu - i386: mmap randomization for executable mappings
>
> Kees Cook (8):
> Revert "UBUNTU: SAUCE: nx-emu: further clarify dmesg reporting"
> Revert "nx-emu: fix inverted report of disable_nx"
> Revert "UBUNTU: SAUCE: nx-emu: use upstream ASLR when possible"
> Revert "exec-randomization: brk away from exec rand area"
> Revert "mmap randomization for executable mappings on 32-bit"
> Revert "nx-emu: standardize boottime message prefix"
> Revert "nx-emu: drop exec-shield sysctl, merge with disable_nx"
> Revert "i386: NX emulation"
>
> arch/x86/kernel/process.c | 6 +++---
> mm/mmap.c | 6 +++---
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> (The above delta between reverts and commits are comment clean-ups and one
> minor code position change for general clarification. Also, I made Ingo the
> author, since the bulk of the code is his work. Hopefully this won't
> complicate the delta review too badly.)
>
> Thanks!
>
> -Kees
>
> --
> Kees Cook
> Ubuntu Security Team
>
More information about the kernel-team
mailing list