| Message ID | 20101105223831.GB5206@outflux.net |
|---|---|
| State | Accepted |
| Delegated to: | Andy Whitcroft |
| Headers | show |
On 11/05/2010 06:38 PM, Kees Cook wrote:
> git://kernel.ubuntu.com/kees/ubuntu-natty.git master
Kees - I think the patch set looks OK, but I'm curious about the change
in provenance. The first patch in in the series appears to originate
from a completely different author as compared to the same patch in
Maverick.
Maverick: UBUNTU: SAUCE: x86: implement cs-limit nx-emulation for ia32
Natty: i386: NX emulation
Can you provide a brief explanation of your thinking as to why the patch
sources seem to have changed?
rtg
Hi Tim, On Mon, Nov 08, 2010 at 07:30:18AM -0500, Tim Gardner wrote: > On 11/05/2010 06:38 PM, Kees Cook wrote: > >git://kernel.ubuntu.com/kees/ubuntu-natty.git master > > Kees - I think the patch set looks OK, but I'm curious about the > change in provenance. The first patch in in the series appears to > originate from a completely different author as compared to the same > patch in Maverick. > > Maverick: UBUNTU: SAUCE: x86: implement cs-limit nx-emulation for ia32 > Natty: i386: NX emulation > > Can you provide a brief explanation of your thinking as to why the > patch sources seem to have changed? Yes, I asked the Fedora kernel team to publish a central git repository for the nx-emulation code since both they and us are slowly making changes to it. This was done: git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland.git fedora/32bit-mmap-exec-randomization [1] fedora/x86-nx-emulation [2] But they don't seem to be taking my pull requests[3], even though they've committed them to Fedora's kernel[4]. I'm trying to get Debian to use the common tree too, so I'm hoping Roland is just on vacation or something. In the meantime, I published my tree with the missing pieces for the basis of the Ubuntu pull request. -Kees [1] http://git.kernel.org/?p=linux/kernel/git/frob/linux-2.6-roland.git;a=shortlog;h=refs/heads/fedora/32bit-mmap-exec-randomization [2] http://git.kernel.org/?p=linux/kernel/git/frob/linux-2.6-roland.git;a=shortlog;h=refs/heads/fedora/x86-nx-emulation [3] http://lists.fedoraproject.org/pipermail/kernel/2010-November/002809.html http://lists.fedoraproject.org/pipermail/kernel/2010-November/002810.html [4] http://lists.fedoraproject.org/pipermail/kernel/2010-October/002805.html
Applied to Natty. -apw
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(-)