1 files changed, 9 insertions, 3 deletions

diff --git a/mm/util.c b/mm/util.c
index 8a1b3a1fb595..03b237746850 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -289,7 +289,7 @@ EXPORT_SYMBOL_GPL(get_user_pages_fast);
 
 unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr,
         unsigned long len, unsigned long prot,
-        unsigned long flag, unsigned long pgoff)
+        unsigned long flag, unsigned long pgoff, bool killable)
 {
         unsigned long ret;
         struct mm_struct *mm = current->mm;
@@ -297,7 +297,12 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr,
 
         ret = security_mmap_file(file, prot, flag);
         if (!ret) {
-                down_write(&mm->mmap_sem);
+                if (killable) {
+                        if (down_write_killable(&mm->mmap_sem))
+                                return -EINTR;
+                } else {
+                        down_write(&mm->mmap_sem);
+                }
                 ret = do_mmap_pgoff(file, addr, len, prot, flag, pgoff,
                                     &populate);
                 up_write(&mm->mmap_sem);
@@ -307,6 +312,7 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr,
         return ret;
 }
 
+/* XXX are all callers checking an error */
 unsigned long vm_mmap(struct file *file, unsigned long addr,
         unsigned long len, unsigned long prot,
         unsigned long flag, unsigned long offset)
@@ -316,7 +322,7 @@ unsigned long vm_mmap(struct file *file, unsigned long addr,
         if (unlikely(offset_in_page(offset)))
                 return -EINVAL;
 
-        return vm_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
+        return vm_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT, false);
 }
 EXPORT_SYMBOL(vm_mmap);