Commit a190887b authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

nommu: fix error handling in do_mmap_pgoff()

Fix the error handling in do_mmap_pgoff().  If do_mmap_shared_file() or
do_mmap_private() fail, we jump to the error_put_region label at which
point we cann __put_nommu_region() on the region - but we haven't yet
added the region to the tree, and so __put_nommu_region() may BUG
because the region tree is empty or it may corrupt the region tree.

To get around this, we can afford to add the region to the region tree
before calling do_mmap_shared_file() or do_mmap_private() as we keep
nommu_region_sem write-locked, so no-one can race with us by seeing a
transient region.
Signed-off-by: default avatarDavid Howells <>
Acked-by: default avatarPekka Enberg <>
Acked-by: default avatarPaul Mundt <>
Cc: Mel Gorman <>
Acked-by: default avatarGreg Ungerer <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 4e49627b
......@@ -1352,6 +1352,7 @@ unsigned long do_mmap_pgoff(struct file *file,
vma->vm_region = region;
/* set up the mapping */
if (file && vma->vm_flags & VM_SHARED)
......@@ -1361,8 +1362,6 @@ unsigned long do_mmap_pgoff(struct file *file,
if (ret < 0)
goto error_put_region;
/* okay... we have a mapping; now we have to register it */
result = vma->vm_start;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment