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

Groups > linux.kernel > #1175602

[PATCH v2 3/5] mremap: don't do mm_populate(new_addr) on failure

Show all headers | View raw

move_vma() sets *locked even if move_page_tables() or ->mremap()
fails, change sys_mremap() to check "ret & ~PAGE_MASK".

I think we should simply remove the VM_LOCKED code in move_vma(),
that is why this patch doesn't change move_vma(). But this needs
more cleanups.

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

diff --git a/mm/mremap.c b/mm/mremap.c
index 3310378..7dcf7b4 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -578,8 +578,10 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
 		ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
 	}
 out:
-	if (ret & ~PAGE_MASK)
+	if (ret & ~PAGE_MASK) {
 		vm_unacct_memory(charged);
+		locked = 0;
+	}
 	up_write(&current->mm->mmap_sem);
 	if (locked && new_len > old_len)
 		mm_populate(new_addr + old_len, new_len - old_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