Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1175601

[PATCH v2 1/5] mremap: don't leak new_vma if f_op->mremap() fails

Show all headers | View raw

move_vma() can't just return if f_op->mremap() fails, we should
unmap the new vma like we do if move_page_tables() fails. To avoid
the code duplication this patch moves the "move entries back" under
the new "if (err)" branch.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
---
 mm/mremap.c |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/mm/mremap.c b/mm/mremap.c
index a7c93ec..f54a43f 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -276,6 +276,12 @@ static unsigned long move_vma(struct vm_area_struct *vma,
 	moved_len = move_page_tables(vma, old_addr, new_vma, new_addr, old_len,
 				     need_rmap_locks);
 	if (moved_len < old_len) {
+		err = -ENOMEM;
+	} else if (vma->vm_file && vma->vm_file->f_op->mremap) {
+		err = vma->vm_file->f_op->mremap(vma->vm_file, new_vma);
+	}
+
+	if (unlikely(err)) {
 		/*
 		 * On error, move entries back from new area to old,
 		 * which will succeed since page tables still there,
@@ -286,16 +292,8 @@ static unsigned long move_vma(struct vm_area_struct *vma,
 		vma = new_vma;
 		old_len = new_len;
 		old_addr = new_addr;
-		new_addr = -ENOMEM;
+		new_addr = err;
 	} else {
-		if (vma->vm_file && vma->vm_file->f_op->mremap) {
-			err = vma->vm_file->f_op->mremap(vma->vm_file, new_vma);
-			if (err < 0) {
-				move_page_tables(new_vma, new_addr, vma,
-						 old_addr, moved_len, true);
-				return err;
-			}
-		}
 		arch_remap(mm, old_addr, old_addr + old_len,
 			   new_addr, new_addr + new_len);
 	}
-- 
1.5.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/5] mremap fix/cleanups Oleg Nesterov <oleg@redhat.com> - 2015-07-02 01:10 +0200
  [PATCH v2 4/5] mremap: don't do uneccesary checks if new_len ==  old_len Oleg Nesterov <oleg@redhat.com> - 2015-07-02 01:10 +0200
  [PATCH v2 2/5] mm: move ->mremap() from file_operations to  vm_operations_struct Oleg Nesterov <oleg@redhat.com> - 2015-07-02 01:10 +0200
  [PATCH v2 1/5] mremap: don't leak new_vma if f_op->mremap() fails Oleg Nesterov <oleg@redhat.com> - 2015-07-02 01:10 +0200
  [PATCH v2 3/5] mremap: don't do mm_populate(new_addr) on failure Oleg Nesterov <oleg@redhat.com> - 2015-07-02 01:10 +0200
  [PATCH v2 5/5] mremap: simplify the "overlap" check in mremap_to() Oleg Nesterov <oleg@redhat.com> - 2015-07-02 01:10 +0200

csiph-web