lkml.org 
[lkml]   [2020]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 050/179] dpaa2-eth: check fsl_mc_get_endpoint for IS_ERR_OR_NULL()
    Date
    From: Ioana Ciornei <ioana.ciornei@nxp.com>

    [ Upstream commit 841eb4012cef84820e5906527b31a854f42b0748 ]

    The fsl_mc_get_endpoint() function can return an error or directly a
    NULL pointer in case the peer device is not under the root DPRC
    container. Treat this case also, otherwise it would lead to a NULL
    pointer when trying to access the peer fsl_mc_device.

    Fixes: 719479230893 ("dpaa2-eth: add MAC/PHY support through phylink")
    Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
    index 569e06d2bab21..72fa9c4e058f7 100644
    --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
    +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
    @@ -3383,7 +3383,7 @@ static int dpaa2_eth_connect_mac(struct dpaa2_eth_priv *priv)

    dpni_dev = to_fsl_mc_device(priv->net_dev->dev.parent);
    dpmac_dev = fsl_mc_get_endpoint(dpni_dev);
    - if (IS_ERR(dpmac_dev) || dpmac_dev->dev.type != &fsl_mc_bus_dpmac_type)
    + if (IS_ERR_OR_NULL(dpmac_dev) || dpmac_dev->dev.type != &fsl_mc_bus_dpmac_type)
    return 0;

    if (dpaa2_mac_is_type_fixed(dpmac_dev, priv->mc_io))
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-27 16:31    [W:4.120 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site