lkml.org 
[lkml]   [2020]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 46/80] ACPI: Add out of bounds and numa_off protections to pxm_to_node()
    Date
    From: Jonathan Cameron <Jonathan.Cameron@huawei.com>

    [ Upstream commit 8a3decac087aa897df5af04358c2089e52e70ac4 ]

    The function should check the validity of the pxm value before using
    it to index the pxm_to_node_map[] array.

    Whilst hardening this code may be good in general, the main intent
    here is to enable following patches that use this function to replace
    acpi_map_pxm_to_node() for non SRAT usecases which should return
    NO_NUMA_NODE for PXM entries not matching with those in SRAT.

    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Reviewed-by: Barry Song <song.bao.hua@hisilicon.com>
    Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/acpi/numa.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
    index eadbf90e65d14..85e01752fbe47 100644
    --- a/drivers/acpi/numa.c
    +++ b/drivers/acpi/numa.c
    @@ -31,7 +31,7 @@ int acpi_numa __initdata;

    int pxm_to_node(int pxm)
    {
    - if (pxm < 0)
    + if (pxm < 0 || pxm >= MAX_PXM_DOMAINS || numa_off)
    return NUMA_NO_NODE;
    return pxm_to_node_map[pxm];
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-10-27 01:03    [W:4.075 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site