mm: make vm_munmap killable

[mirror_ubuntu-zesty-kernel.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 420088682d4ac8d96ceb0f7eb5993d8984758773..ca292a7c2b68c3a05c1e2c661f1864c20cb497e1 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2494,11 +2494,9 @@ int vm_munmap(unsigned long start, size_t len)
        int ret;
        struct mm_struct *mm = current->mm;
 
-       /*
-        * XXX convert to down_write_killable as soon as all users are able
-        * to handle the error.
-        */
-       down_write(&mm->mmap_sem);
+       if (down_write_killable(&mm->mmap_sem))
+               return -EINTR;
+
        ret = do_munmap(mm, start, len);
        up_write(&mm->mmap_sem);
        return ret;