patch-2.0.32 linux/kernel/fork.c

• Lines: 65
• Date: Wed Nov 12 20:36:41 1997
• Orig file: v2.0.31/linux/kernel/fork.c
• Orig date: Wed Oct 15 08:32:00 1997

diff -u --recursive --new-file v2.0.31/linux/kernel/fork.c linux/kernel/fork.c
@@ -93,11 +93,6 @@
 		tmp->vm_flags &= ~VM_LOCKED;
 		tmp->vm_mm = mm;
 		tmp->vm_next = NULL;
-		if (copy_page_range(mm, current->mm, tmp)) {
-			kfree(tmp);
-			exit_mmap(mm);
-			return -ENOMEM;
-		}
 		if (tmp->vm_inode) {
 			tmp->vm_inode->i_count++;
 			/* insert tmp into the share list, just after mpnt */
@@ -105,12 +100,22 @@
 			mpnt->vm_next_share = tmp;
 			tmp->vm_prev_share = mpnt;
 		}
+		if (copy_page_range(mm, current->mm, tmp)) {
+			if (mpnt->vm_next_share == tmp) {
+				tmp->vm_prev_share->vm_next_share = tmp->vm_next_share;
+				tmp->vm_next_share->vm_prev_share = tmp->vm_prev_share;	
+			}
+			kfree(tmp);
+			exit_mmap(mm);
+			return -ENOMEM;
+		}
 		if (tmp->vm_ops && tmp->vm_ops->open)
 			tmp->vm_ops->open(tmp);
 		*p = tmp;
 		p = &tmp->vm_next;
 	}
 	build_mmap_avl(mm);
+	flush_tlb_mm(current->mm);
 	return 0;
 }
 
@@ -119,7 +124,7 @@
 	if (!(clone_flags & CLONE_VM)) {
 		struct mm_struct * mm = kmalloc(sizeof(*tsk->mm), GFP_KERNEL);
 		if (!mm)
-			return -1;
+			return -ENOMEM;
 		*mm = *current->mm;
 		mm->count = 1;
 		mm->def_flags = 0;
@@ -128,13 +133,18 @@
 		tsk->min_flt = tsk->maj_flt = 0;
 		tsk->cmin_flt = tsk->cmaj_flt = 0;
 		tsk->nswap = tsk->cnswap = 0;
-		if (new_page_tables(tsk))
+		if (new_page_tables(tsk)) {
+			tsk->mm = NULL;
+			exit_mmap(mm);
 			goto free_mm;
+		}
 		if (dup_mmap(mm)) {
+			tsk->mm = NULL;
+			exit_mmap(mm);
 			free_page_tables(mm);
 free_mm:
 			kfree(mm);
-			return -1;
+			return -ENOMEM;
 		}
 		return 0;
 	}