lkml.org 
[lkml]   [2021]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 32/74] net: mvpp2: check return value after calling platform_get_resource()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit 0bb51a3a385790a4be20085494cf78f70dadf646 ]

    It will cause null-ptr-deref if platform_get_resource() returns NULL,
    we need check the return value.

    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
    index 491bcfd36ac2..d5cf9afab103 100644
    --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
    +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
    @@ -5740,6 +5740,10 @@ static int mvpp2_probe(struct platform_device *pdev)
    return PTR_ERR(priv->lms_base);
    } else {
    res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
    + if (!res) {
    + dev_err(&pdev->dev, "Invalid resource\n");
    + return -EINVAL;
    + }
    if (has_acpi_companion(&pdev->dev)) {
    /* In case the MDIO memory region is declared in
    * the ACPI, it can already appear as 'in-use'
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-06 14:11    [W:3.167 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site