Messages in this thread Patch in this message | | | From | Peng Fan <> | Subject | [PATCH] mm/cma: cma_declare_contiguous: correct err handling | Date | Thu, 14 Feb 2019 12:45:51 +0000 |
| |
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
| |