Commit 89133786 authored Jul 29, 2012 by Oleg Nesterov Committed by Ingo Molnar Jul 30, 2012

uprobes: Remove insert_vm_struct()->uprobe_mmap()



Remove insert_vm_struct()->uprobe_mmap(). It is not needed, nobody
except arch/ia64/kernel/perfmon.c uses insert_vm_struct(vma)
with vma->vm_file != NULL.

And it is wrong. Again, get_user_pages() can not succeed before
vma_link(vma) makes is visible to find_vma(). And even if this
worked, we must not insert the new bp before this mapping is
visible to vma_prio_tree_foreach() for uprobe_unregister().

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar.vnet.ibm.com>
Cc: Anton Arapov <anton@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20120729182238.GA20349@redhat.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 6dab3cc0

mm/mmap.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -2345,9 +2345,6 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
		security_vm_enough_memory_mm(mm, vma_pages(vma)))
		return -ENOMEM;

		if (vma->vm_file && uprobe_mmap(vma))
		return -EINVAL;

		vma_link(mm, vma, prev, rb_link, rb_parent);
		return 0;
		}

Admin message