From: Austin Kim <austindh.kim@gmail.com>
To: akpm@linux-foundation.org, urezki@gmail.com, guro@fb.com,
rpenyaev@suse.de, mhocko@suse.com, rick.p.edgecombe@intel.com,
rppt@linux.ibm.com, aryabinin@virtuozzo.com
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, austindh.kim@gmail.com
Subject: [PATCH] mm/vmalloc: move 'area->pages' after if statement
Date: Fri, 30 Aug 2019 12:57:16 +0900 [thread overview]
Message-ID: <20190830035716.GA190684@LGEARND20B15> (raw)
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@gmail.com>
---
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
next reply other threads:[~2019-08-30 3:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-30 3:57 Austin Kim [this message]
2019-08-30 5:38 ` [PATCH] mm/vmalloc: move 'area->pages' after if statement Michal Hocko
2019-08-30 20:50 ` Andrew Morton
2019-09-02 14:15 ` Vlastimil Babka
2019-09-02 21:28 ` Austin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190830035716.GA190684@LGEARND20B15 \
--to=austindh.kim@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=guro@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=rick.p.edgecombe@intel.com \
--cc=rpenyaev@suse.de \
--cc=rppt@linux.ibm.com \
--cc=urezki@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).