The patch titled
x86_64: Fix stack/mmap randomization for compat tasks
has been added to the -mm tree. Its filename is
x86_64-fix-stack-mmap-randomization-for-compat.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86_64: Fix stack/mmap randomization for compat tasks
From: "Andi Kleen" <ak@xxxxxxx>
ia32_setup_arg_pages would ignore the passed in random stack top and use its
own static value.
Now it uses the 8bit of randomness native i386 would use too.
This indirectly fixes mmap randomization for 32bit processes too, which
depends on the stack randomization.
Should also give slightly better virtual cache colouring and possibly better
performance with HyperThreading.
Signed-off-by: Andi Kleen <ak@xxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/ia32/ia32_binfmt.c | 4 ++--
include/asm-x86_64/elf.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/x86_64/ia32/ia32_binfmt.c~x86_64-fix-stack-mmap-randomization-for-compat arch/x86_64/ia32/ia32_binfmt.c
--- devel/arch/x86_64/ia32/ia32_binfmt.c~x86_64-fix-stack-mmap-randomization-for-compat 2006-05-29 14:16:18.000000000 -0700
+++ devel-akpm/arch/x86_64/ia32/ia32_binfmt.c 2006-05-29 14:16:18.000000000 -0700
@@ -339,7 +339,7 @@ int ia32_setup_arg_pages(struct linux_bi
struct mm_struct *mm = current->mm;
int i, ret;
- stack_base = IA32_STACK_TOP - MAX_ARG_PAGES * PAGE_SIZE;
+ stack_base = stack_top - MAX_ARG_PAGES * PAGE_SIZE;
mm->arg_start = bprm->p + stack_base;
bprm->p += stack_base;
@@ -357,7 +357,7 @@ int ia32_setup_arg_pages(struct linux_bi
{
mpnt->vm_mm = mm;
mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;
- mpnt->vm_end = IA32_STACK_TOP;
+ mpnt->vm_end = stack_top;
if (executable_stack == EXSTACK_ENABLE_X)
mpnt->vm_flags = VM_STACK_FLAGS | VM_EXEC;
else if (executable_stack == EXSTACK_DISABLE_X)
diff -puN include/asm-x86_64/elf.h~x86_64-fix-stack-mmap-randomization-for-compat include/asm-x86_64/elf.h
--- devel/include/asm-x86_64/elf.h~x86_64-fix-stack-mmap-randomization-for-compat 2006-05-29 14:16:18.000000000 -0700
+++ devel-akpm/include/asm-x86_64/elf.h 2006-05-29 14:16:18.000000000 -0700
@@ -159,7 +159,7 @@ extern int dump_task_fpu (struct task_st
#define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
/* 1GB for 64bit, 8MB for 32bit */
-#define STACK_RND_MASK (is_compat_task() ? 0x7ff : 0x3fffff)
+#define STACK_RND_MASK (test_thread_flag(TIF_IA32) ? 0x7ff : 0x3fffff)
#endif
_
Patches currently in -mm which might be from ak@xxxxxxx are
x86_64-fix-stack-mmap-randomization-for-compat.patch
x86_64-fix-no-iommu-warning-in-pci-gart-driver.patch
i386-apic=-command-line-option-should-always-be.patch
x86_64-fix-last_tsc-calculation-of-pm-timer.patch
x86_64-handle-empty-node-zero.patch
x86_64-fix-off-by-one-in-bad_addr-checking-in.patch
x86_64-dont-do-syscall-exit-tracing-twice.patch
git-acpi.patch
git-agpgart.patch
x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
