From: Yue Hu <zbestahu@gmail.com>
To: akpm@linux-foundation.org, iamjoonsoo.kim@lge.com,
labbott@redhat.com, rppt@linux.vnet.ibm.com,
rdunlap@infradead.org
Cc: linux-mm@kvack.org, huyue2@yulong.com
Subject: [PATCH] mm/cma: Fix crash on CMA allocation if bitmap allocation fails
Date: Mon, 25 Mar 2019 16:13:09 +0800 [thread overview]
Message-ID: <20190325081309.6004-1-zbestahu@gmail.com> (raw)
From: Yue Hu <huyue2@yulong.com>
A previous commit f022d8cb7ec7 ("mm: cma: Don't crash on allocation
if CMA area can't be activated") fixes the crash issue when activation
fails via setting cma->count as 0, same logic exists if bitmap
allocation fails.
Signed-off-by: Yue Hu <huyue2@yulong.com>
---
mm/cma.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mm/cma.c b/mm/cma.c
index f5bf819..991a6ce 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -106,8 +106,10 @@ static int __init cma_activate_area(struct cma *cma)
cma->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
- if (!cma->bitmap)
+ if (!cma->bitmap) {
+ cma->count = 0;
return -ENOMEM;
+ }
WARN_ON_ONCE(!pfn_valid(pfn));
zone = page_zone(pfn_to_page(pfn));
--
1.9.1
next reply other threads:[~2019-03-25 8:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-25 8:13 Yue Hu [this message]
2019-03-25 10:14 ` Anshuman Khandual
2019-03-25 22:15 ` Andrew Morton
2019-03-26 1:59 ` Yue Hu
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=20190325081309.6004-1-zbestahu@gmail.com \
--to=zbestahu@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=huyue2@yulong.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=labbott@redhat.com \
--cc=linux-mm@kvack.org \
--cc=rdunlap@infradead.org \
--cc=rppt@linux.vnet.ibm.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