提交 023accf5 编写于 作者: M Mike Rapoport

memblock: ensure there is no overflow in memblock_overlaps_region()

There maybe an overflow in memblock_overlaps_region() if it is called with
base and size such that

	base + size > PHYS_ADDR_MAX

Make sure that memblock_overlaps_region() caps the size to prevent such
overflow and remove now duplicated call to memblock_cap_size() from
memblock_is_region_reserved().
Signed-off-by: NMike Rapoport <rppt@linux.ibm.com>
Tested-by: NTony Lindgren <tony@atomide.com>
上级 f921f53e
...@@ -182,6 +182,8 @@ bool __init_memblock memblock_overlaps_region(struct memblock_type *type, ...@@ -182,6 +182,8 @@ bool __init_memblock memblock_overlaps_region(struct memblock_type *type,
{ {
unsigned long i; unsigned long i;
memblock_cap_size(base, &size);
for (i = 0; i < type->cnt; i++) for (i = 0; i < type->cnt; i++)
if (memblock_addrs_overlap(base, size, type->regions[i].base, if (memblock_addrs_overlap(base, size, type->regions[i].base,
type->regions[i].size)) type->regions[i].size))
...@@ -1794,7 +1796,6 @@ bool __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t siz ...@@ -1794,7 +1796,6 @@ bool __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t siz
*/ */
bool __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size) bool __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)
{ {
memblock_cap_size(base, &size);
return memblock_overlaps_region(&memblock.reserved, base, size); return memblock_overlaps_region(&memblock.reserved, base, size);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册