diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-04-16 21:31:58 +0200 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-04-16 21:31:58 +0200 |
| commit | e492cd61b986590a45c674ede7dd1c4dbf94cf24 (patch) | |
| tree | 37dc59ea66842b5b7e57f32aba6cbce5143c1282 /mm/vmalloc.c | |
| parent | sched/numa: use hash_32 to mix up PIDs accessing VMA (diff) | |
| parent | Revert "userfaultfd: don't fail on unrecognized features" (diff) | |
| download | linux-e492cd61b986590a45c674ede7dd1c4dbf94cf24.tar.xz linux-e492cd61b986590a45c674ede7dd1c4dbf94cf24.zip | |
sync mm-stable with mm-hotfixes-stable to pick up depended-upon upstream changes
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 5291c6f02cf7..3fa476f17887 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3042,9 +3042,11 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, * allocation request, free them via vfree() if any. */ if (area->nr_pages != nr_small_pages) { - warn_alloc(gfp_mask, NULL, - "vmalloc error: size %lu, page order %u, failed to allocate pages", - area->nr_pages * PAGE_SIZE, page_order); + /* vm_area_alloc_pages() can also fail due to a fatal signal */ + if (!fatal_signal_pending(current)) + warn_alloc(gfp_mask, NULL, + "vmalloc error: size %lu, page order %u, failed to allocate pages", + area->nr_pages * PAGE_SIZE, page_order); goto fail; } |