patch-2.2.16 linux/mm/mmap.c

• Lines: 18
• Date: Wed Jun 7 14:26:44 2000
• Orig file: v2.2.15/linux/mm/mmap.c
• Orig date: Tue Jan 4 10:12:26 2000

diff -urN v2.2.15/linux/mm/mmap.c linux/mm/mmap.c
@@ -197,6 +197,8 @@
 	if (mm->def_flags & VM_LOCKED) {
 		unsigned long locked = mm->locked_vm << PAGE_SHIFT;
 		locked += len;
+		if (locked < len)
+			return -EAGAIN;
 		if ((current->rlim[RLIMIT_MEMLOCK].rlim_cur < RLIM_INFINITY) &&
 		   (locked > current->rlim[RLIMIT_MEMLOCK].rlim_cur))
 			return -EAGAIN;
@@ -289,6 +291,8 @@
 		goto free_vma;
 
 	/* Check against address space limit. */
+	if ((mm->total_vm << PAGE_SHIFT) + len < len)
+		goto free_vma;
 	if ((current->rlim[RLIMIT_AS].rlim_cur < RLIM_INFINITY) &&
 	    ((mm->total_vm << PAGE_SHIFT) + len
 	    > current->rlim[RLIMIT_AS].rlim_cur))