lkml.org 
[lkml]   [2022]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 28/52] net: emaclite: Add error handling for of_address_to_resource()
    Date
    From: Shravya Kumbham <shravya.kumbham@xilinx.com>

    commit 7a6bc33ab54923d325d9a1747ec9652c4361ebd1 upstream.

    check the return value of of_address_to_resource() and also add
    missing of_node_put() for np and npp nodes.

    Fixes: e0a3bc65448c ("net: emaclite: Support multiple phys connected to one MDIO bus")
    Addresses-Coverity: Event check_return value.
    Signed-off-by: Shravya Kumbham <shravya.kumbham@xilinx.com>
    Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
    Signed-off-by: Paolo Abeni <pabeni@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/xilinx/xilinx_emaclite.c | 15 ++++++++++++---
    1 file changed, 12 insertions(+), 3 deletions(-)

    --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
    +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
    @@ -820,10 +820,10 @@ static int xemaclite_mdio_write(struct m
    static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev)
    {
    struct mii_bus *bus;
    - int rc;
    struct resource res;
    struct device_node *np = of_get_parent(lp->phy_node);
    struct device_node *npp;
    + int rc, ret;

    /* Don't register the MDIO bus if the phy_node or its parent node
    * can't be found.
    @@ -833,8 +833,14 @@ static int xemaclite_mdio_setup(struct n
    return -ENODEV;
    }
    npp = of_get_parent(np);
    -
    - of_address_to_resource(npp, 0, &res);
    + ret = of_address_to_resource(npp, 0, &res);
    + of_node_put(npp);
    + if (ret) {
    + dev_err(dev, "%s resource error!\n",
    + dev->of_node->full_name);
    + of_node_put(np);
    + return ret;
    + }
    if (lp->ndev->mem_start != res.start) {
    struct phy_device *phydev;
    phydev = of_phy_find_device(lp->phy_node);
    @@ -843,6 +849,7 @@ static int xemaclite_mdio_setup(struct n
    "MDIO of the phy is not registered yet\n");
    else
    put_device(&phydev->mdio.dev);
    + of_node_put(np);
    return 0;
    }

    @@ -855,6 +862,7 @@ static int xemaclite_mdio_setup(struct n
    bus = mdiobus_alloc();
    if (!bus) {
    dev_err(dev, "Failed to allocate mdiobus\n");
    + of_node_put(np);
    return -ENOMEM;
    }

    @@ -867,6 +875,7 @@ static int xemaclite_mdio_setup(struct n
    bus->parent = dev;

    rc = of_mdiobus_register(bus, np);
    + of_node_put(np);
    if (rc) {
    dev_err(dev, "Failed to register mdio bus.\n");
    goto err_register;

    \
     
     \ /
      Last update: 2022-05-10 15:47    [W:2.204 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site