1 files changed, 3 insertions, 1 deletions

diff --git a/mm/mremap.c b/mm/mremap.c
index 3310378bb60f..7dcf7b42068e 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);