]> Git Repo - linux.git/commitdiff
vmalloc: back off when the current task is killed
authorMichal Hocko <[email protected]>
Fri, 24 Feb 2017 22:58:53 +0000 (14:58 -0800)
committerLinus Torvalds <[email protected]>
Sat, 25 Feb 2017 01:46:55 +0000 (17:46 -0800)
__vmalloc_area_node() allocates pages to cover the requested vmalloc
size.  This can be a lot of memory.  If the current task is killed by
the OOM killer, and thus has an unlimited access to memory reserves, it
can consume all the memory theoretically.  Fix this by checking for
fatal_signal_pending and back off early.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Michal Hocko <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Cc: Tetsuo Handa <[email protected]>
Cc: Al Viro <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
mm/vmalloc.c

index d89034a393f276457118b0696613c92c83ae8fcc..011b446f87583b94a6353670dc5ce3f94faf7299 100644 (file)
@@ -1642,6 +1642,11 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
        for (i = 0; i < area->nr_pages; i++) {
                struct page *page;
 
+               if (fatal_signal_pending(current)) {
+                       area->nr_pages = i;
+                       goto fail;
+               }
+
                if (node == NUMA_NO_NODE)
                        page = alloc_page(alloc_mask);
                else
This page took 0.060966 seconds and 4 git commands to generate.