Skip to content

Commit 2532e6c

Browse files
riteshharjaniakpm00
authored andcommitted
cma: enforce non-zero pageblock_order during cma_init_reserved_mem()
cma_init_reserved_mem() checks base and size alignment with CMA_MIN_ALIGNMENT_BYTES. However, some users might call this during early boot when pageblock_order is 0. That means if base and size does not have pageblock_order alignment, it can cause functional failures during cma activate area. So let's enforce pageblock_order to be non-zero during cma_init_reserved_mem() to catch such wrong usages. 1. This was seen with fadump on PowerPC which was calling cma_init_reserved_mem() before the pageblock_order was initialized. This is now fixed in the fadump on PowerPC itself. The details of that can be found in the patch including the userspace-visible effect of the issue [1]. 2. However it was also decided that we should add a stronger enforcement check within cma_init_reserved_mem() to catch such wrong usages [2]. Hence this patch. This is ok to be in -next and there is no "Fixes" tag required for this patch. [1]: https://lore.kernel.org/all/3ae208e48c0d9cefe53d2dc4f593388067405b7d.1729146153.git.ritesh.list@gmail.com/ [2]: https://lore.kernel.org/all/[email protected]/ Link: https://lkml.kernel.org/r/e274344b44d5f80fa54c52f530387257fe99ec65.1731505681.git.ritesh.list@gmail.com Signed-off-by: Ritesh Harjani (IBM) <[email protected]> Acked-by: David Hildenbrand <[email protected]> Acked-by: Zi Yan <[email protected]> Reviewed-by: Anshuman Khandual <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 811808d commit 2532e6c

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

mm/cma.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,15 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size,
181181
if (!size || !memblock_is_region_reserved(base, size))
182182
return -EINVAL;
183183

184+
/*
185+
* CMA uses CMA_MIN_ALIGNMENT_BYTES as alignment requirement which
186+
* needs pageblock_order to be initialized. Let's enforce it.
187+
*/
188+
if (!pageblock_order) {
189+
pr_err("pageblock_order not yet initialized. Called during early boot?\n");
190+
return -EINVAL;
191+
}
192+
184193
/* ensure minimal alignment required by mm core */
185194
if (!IS_ALIGNED(base | size, CMA_MIN_ALIGNMENT_BYTES))
186195
return -EINVAL;

0 commit comments

Comments
 (0)