patch-2.1.12 linux/mm/mremap.c

• Lines: 18
• Date: Fri Nov 22 16:23:54 1996
• Orig file: v2.1.11/linux/mm/mremap.c
• Orig date: Tue Oct 29 19:58:48 1996

diff -u --recursive --new-file v2.1.11/linux/mm/mremap.c linux/mm/mremap.c
@@ -146,6 +146,7 @@
 			insert_vm_struct(current->mm, new_vma);
 			merge_segments(current->mm, new_vma->vm_start, new_vma->vm_end);
 			do_munmap(addr, old_len);
+			current->mm->total_vm += new_len >> PAGE_SHIFT;
 			return new_addr;
 		}
 		kfree(new_vma);
@@ -192,6 +193,9 @@
 		if (locked > current->rlim[RLIMIT_MEMLOCK].rlim_cur)
 			return -EAGAIN;
 	}
+	if ((current->mm->total_vm << PAGE_SHIFT) + (new_len - old_len)
+	    > current->rlim[RLIMIT_AS].rlim_cur)
+		return -ENOMEM;
 
 	/* old_len exactly to the end of the area.. */
 	if (old_len == vma->vm_end - addr &&