github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 13:37:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

memblock: ensure there is no overflow in memblock_overlaps_region()

Browse Source 
[ Upstream commit 023accf5cd ]

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: Mike Rapoport <rppt@linux.ibm.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/lkml/20210630071211.21011-1-rppt@kernel.org/
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mike Rapoport 2021-12-13 17:41:33 +08:00 committed by Greg Kroah-Hartman
parent 74551f13c6
commit 6e634c0e71
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mm/memblock.c
View File

@ -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))
@ -1792,7 +1794,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);
} }