patch-2.0.27 linux/include/linux/mm.h

• Lines: 15
• Date: Sun Dec 1 19:59:18 1996
• Orig file: v2.0.26/linux/include/linux/mm.h
• Orig date: Wed Sep 11 17:57:18 1996

diff -u --recursive --new-file v2.0.26/linux/include/linux/mm.h linux/include/linux/mm.h
@@ -319,10 +319,12 @@
 	unsigned long grow;
 
 	address &= PAGE_MASK;
+	grow = vma->vm_start - address;
 	if (vma->vm_end - address
-	    > (unsigned long) current->rlim[RLIMIT_STACK].rlim_cur)
+	    > (unsigned long) current->rlim[RLIMIT_STACK].rlim_cur ||
+	    (vma->vm_mm->total_vm << PAGE_SHIFT) + grow
+	    > (unsigned long) current->rlim[RLIMIT_AS].rlim_cur)
 		return -ENOMEM;
-	grow = vma->vm_start - address;
 	vma->vm_start = address;
 	vma->vm_offset -= grow;
 	vma->vm_mm->total_vm += grow >> PAGE_SHIFT;