Attachment 158124 Details for Bug 246086 – Backport of upstream patch to fix Committed_AS leakage

[patch] Backport of upstream patch to fix Committed_AS leakage

linux-2.6.9-committed_as-fix.patch (text/plain), 2.24 KB, created by Chris Lalancette on 2007-06-28 13:48:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2007-06-28 13:48:27 UTC

Size: 2.24 KB

patch

obsolete

>diff -urp linux-2.6.9.orig/arch/ia64/ia32/binfmt_elf32.c linux-2.6.9/arch/ia64/ia32/binfmt_elf32.c
>--- linux-2.6.9.orig/arch/ia64/ia32/binfmt_elf32.c	2007-06-28 09:26:23.000000000 -0400
>+++ linux-2.6.9/arch/ia64/ia32/binfmt_elf32.c	2007-06-28 09:28:07.000000000 -0400
>@@ -216,12 +216,6 @@ ia32_setup_arg_pages (struct linux_binpr
> 	if (!mpnt)
> 		return -ENOMEM;
> 
>-	if (security_vm_enough_memory((IA32_STACK_TOP - (PAGE_MASK & (unsigned long) bprm->p))
>-				      >> PAGE_SHIFT)) {
>-		kmem_cache_free(vm_area_cachep, mpnt);
>-		return -ENOMEM;
>-	}
>-
> 	memset(mpnt, 0, sizeof(*mpnt));
> 
> 	down_write(&current->mm->mmap_sem);
>diff -urp linux-2.6.9.orig/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.9/arch/x86_64/ia32/ia32_binfmt.c
>--- linux-2.6.9.orig/arch/x86_64/ia32/ia32_binfmt.c	2007-06-28 09:26:32.000000000 -0400
>+++ linux-2.6.9/arch/x86_64/ia32/ia32_binfmt.c	2007-06-28 09:28:07.000000000 -0400
>@@ -350,11 +350,6 @@ int setup_arg_pages(struct linux_binprm 
> 	mpnt = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
> 	if (!mpnt) 
> 		return -ENOMEM; 
>-	
>-	if (security_vm_enough_memory((IA32_STACK_TOP - (PAGE_MASK & (unsigned long) bprm->p))>>PAGE_SHIFT)) {
>-		kmem_cache_free(vm_area_cachep, mpnt);
>-		return -ENOMEM;
>-	}
> 
> 	memset(mpnt, 0, sizeof(*mpnt));
> 
>diff -urp linux-2.6.9.orig/fs/exec.c linux-2.6.9/fs/exec.c
>--- linux-2.6.9.orig/fs/exec.c	2007-06-28 09:26:36.000000000 -0400
>+++ linux-2.6.9/fs/exec.c	2007-06-28 09:28:11.000000000 -0400
>@@ -414,11 +414,6 @@ int setup_arg_pages(struct linux_binprm 
> 	if (!mpnt)
> 		return -ENOMEM;
> 
>-	if (security_vm_enough_memory(arg_size >> PAGE_SHIFT)) {
>-		kmem_cache_free(vm_area_cachep, mpnt);
>-		return -ENOMEM;
>-	}
>-
> 	memset(mpnt, 0, sizeof(*mpnt));
> 
> 	down_write(&mm->mmap_sem);
>diff -urp linux-2.6.9.orig/mm/mmap.c linux-2.6.9/mm/mmap.c
>--- linux-2.6.9.orig/mm/mmap.c	2007-06-28 09:26:35.000000000 -0400
>+++ linux-2.6.9/mm/mmap.c	2007-06-28 09:28:11.000000000 -0400
>@@ -2054,6 +2054,9 @@ int insert_vm_struct(struct mm_struct * 
> 	__vma = find_vma_prepare(mm,vma->vm_start,&prev,&rb_link,&rb_parent);
> 	if (__vma && __vma->vm_start < vma->vm_end)
> 		return -ENOMEM;
>+	if ((vma->vm_flags & VM_ACCOUNT) &&
>+	     security_vm_enough_memory(vma_pages(vma)))
>+		return -ENOMEM;
> 	vma_link(mm, vma, prev, rb_link, rb_parent);
> 	return 0;
> }

Actions: View | Diff

Attachments on bug 246086: 158124