Attachment 28092 Details for Bug 65373

[patch] rlimit-memlock.patch

rlimit-memlock.patch (text/plain), 1.16 KB, created by Marcus Meissner on 2005-02-01 17:45:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2005-02-01 17:45:22 UTC

Size: 1.16 KB

patch

obsolete

>
>diff -u linux-2.6.10/mm/mmap.c linux-2.6.10/mm/mmap.c
>--- linux-2.6.10/mm/mmap.c	2005-01-07 15:31:43.000000000 +0000
>+++ linux-2.6.10/mm/mmap.c	2005-01-07 23:10:52.419633392 +0000
>@@ -1360,6 +1360,13 @@
> 		vm_unacct_memory(grow);
> 		return -ENOMEM;
> 	}
>+	if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) &&
>+			((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) >
>+			current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) {
>+		anon_vma_unlock(vma);
>+		vm_unacct_memory(grow);
>+		return -ENOMEM;
>+	}
> 	vma->vm_end = address;
> 	vma->vm_mm->total_vm += grow;
> 	if (vma->vm_flags & VM_LOCKED)
>@@ -1422,6 +1429,13 @@
> 		vm_unacct_memory(grow);
> 		return -ENOMEM;
> 	}
>+	if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) &&
>+			((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) >
>+			current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) {
>+		anon_vma_unlock(vma);
>+		vm_unacct_memory(grow);
>+		return -ENOMEM;
>+	}
> 	vma->vm_start = address;
> 	vma->vm_pgoff -= grow;
> 	vma->vm_mm->total_vm += grow;
>@@ -1833,6 +1847,7 @@
> 	down_write(&current->mm->mmap_sem);
> 	ret = __do_brk(addr, len);
> 	up_write(&current->mm->mmap_sem);
>+	return ret;
> }
> 
> EXPORT_SYMBOL(do_brk);
>only in patch2:
>unchanged:

Actions: View | Diff

Attachments on bug 65373: 28092