lkml.org 
[lkml]   [2021]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 16/18] memblock: ensure there is no overflow in memblock_overlaps_region()
    Date
    From: Mike Rapoport <rppt@linux.ibm.com>

    commit 023accf5cdc1e504a9b04187ec23ff156fe53d90 upstream.

    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>
    ---
    mm/memblock.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/mm/memblock.c
    +++ b/mm/memblock.c
    @@ -164,6 +164,8 @@ bool __init_memblock memblock_overlaps_r
    {
    unsigned long i;

    + memblock_cap_size(base, &size);
    +
    for (i = 0; i < type->cnt; i++)
    if (memblock_addrs_overlap(base, size, type->regions[i].base,
    type->regions[i].size))
    @@ -1760,7 +1762,6 @@ bool __init_memblock memblock_is_region_
    */
    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);
    }


    \
     
     \ /
      Last update: 2021-12-15 18:29    [W:6.553 / U:4.412 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site