[PATCH] mm/vmalloc: move 'area->pages' after if statement

From: Austin Kim
Date: Thu Aug 29 2019 - 23:57:24 EST


If !area->pages statement is true where memory allocation fails,
area is freed.

In this case 'area->pages = pages' should not executed.
So move 'area->pages = pages' after if statement.

Signed-off-by: Austin Kim <austindh.kim@xxxxxxxxx>
---
mm/vmalloc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index b810103..af93ba6 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2416,13 +2416,15 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
} else {
pages = kmalloc_node(array_size, nested_gfp, node);
}
- area->pages = pages;
- if (!area->pages) {
+
+ if (!pages) {
remove_vm_area(area->addr);
kfree(area);
return NULL;
}

+ area->pages = pages;
+
for (i = 0; i < area->nr_pages; i++) {
struct page *page;

--
2.6.2