1 files changed, 8 insertions, 0 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index 92870be50bba..9440d61b925c 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -440,6 +440,14 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
                         continue;
                 }
                 charge = 0;
+                /*
+                 * Don't duplicate many vmas if we've been oom-killed (for
+                 * example)
+                 */
+                if (fatal_signal_pending(current)) {
+                        retval = -EINTR;
+                        goto out;
+                }
                 if (mpnt->vm_flags & VM_ACCOUNT) {
                         unsigned long len = vma_pages(mpnt);