From: Peng Fan <peng.fan@nxp.com>
To: "akpm@linux-foundation.org" <akpm@linux-foundation.org>,
"labbott@redhat.com" <labbott@redhat.com>,
"mhocko@suse.com" <mhocko@suse.com>,
"vbabka@suse.cz" <vbabka@suse.cz>,
"iamjoonsoo.kim@lge.com" <iamjoonsoo.kim@lge.com>,
"rppt@linux.vnet.ibm.com" <rppt@linux.vnet.ibm.com>,
"m.szyprowski@samsung.com" <m.szyprowski@samsung.com>,
"rdunlap@infradead.org" <rdunlap@infradead.org>,
"andreyknvl@google.com" <andreyknvl@google.com>
Cc: "linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"van.freenix@gmail.com" <van.freenix@gmail.com>,
Peng Fan <peng.fan@nxp.com>
Subject: [PATCH] mm/cma: cma_declare_contiguous: correct err handling
Date: Thu, 14 Feb 2019 12:45:51 +0000 [thread overview]
Message-ID: <20190214125704.6678-1-peng.fan@nxp.com> (raw)
In case cma_init_reserved_mem failed, need to free the memblock allocated
by memblock_reserve or memblock_alloc_range.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
V1:
code inspection, I do not met failure in cma_init_reserved_mem.
mm/cma.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mm/cma.c b/mm/cma.c
index c7b39dd3b4f6..f4f3a8a57d86 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -353,12 +353,14 @@ int __init cma_declare_contiguous(phys_addr_t base,
ret = cma_init_reserved_mem(base, size, order_per_bit, name, res_cma);
if (ret)
- goto err;
+ goto free_mem;
pr_info("Reserved %ld MiB at %pa\n", (unsigned long)size / SZ_1M,
&base);
return 0;
+free_mem:
+ memblock_free(base, size);
err:
pr_err("Failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M);
return ret;
--
2.16.4
next reply other threads:[~2019-02-14 12:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 12:45 Peng Fan [this message]
2019-02-14 20:38 ` [PATCH] mm/cma: cma_declare_contiguous: correct err handling Andrew Morton
2019-02-15 1:30 ` Peng Fan
2019-02-19 16:55 ` Vlastimil Babka
2019-02-19 17:46 ` Mike Rapoport
2019-02-22 12:55 ` Peng Fan
2019-02-26 11:11 ` Mike Rapoport
2019-02-26 14:52 ` Catalin Marinas
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=20190214125704.6678-1-peng.fan@nxp.com \
--to=peng.fan@nxp.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@google.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=labbott@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=m.szyprowski@samsung.com \
--cc=mhocko@suse.com \
--cc=rdunlap@infradead.org \
--cc=rppt@linux.vnet.ibm.com \
--cc=van.freenix@gmail.com \
--cc=vbabka@suse.cz \
/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).