2017-12-15 21:52:56

by Alexey Khoroshilov

Subject: [PATCH] net: phy: xgene: disable clk on error paths

There are several error paths in xgene_mdio_probe(),
where clk is left undisabled. The patch fixes them.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <[email protected]>
---
drivers/net/phy/mdio-xgene.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/drivers/net/phy/mdio-xgene.c b/drivers/net/phy/mdio-xgene.c
index bfd3090fb055..07c6048200c6 100644
--- a/drivers/net/phy/mdio-xgene.c
+++ b/drivers/net/phy/mdio-xgene.c
@@ -194,8 +194,11 @@ static int xgene_mdio_reset(struct xgene_mdio_pdata *pdata)
}

ret = xgene_enet_ecc_init(pdata);
- if (ret)
+ if (ret) {
+ if (pdata->dev->of_node)
+ clk_disable_unprepare(pdata->clk);
return ret;
+ }
xgene_gmac_reset(pdata);

return 0;
@@ -388,8 +391,10 @@ static int xgene_mdio_probe(struct platform_device *pdev)
return ret;

mdio_bus = mdiobus_alloc();
- if (!mdio_bus)
- return -ENOMEM;
+ if (!mdio_bus) {
+ ret = -ENOMEM;
+ goto out_clk;
+ }

mdio_bus->name = "APM X-Gene MDIO bus";

@@ -418,7 +423,7 @@ static int xgene_mdio_probe(struct platform_device *pdev)
mdio_bus->phy_mask = ~0;
ret = mdiobus_register(mdio_bus);
if (ret)
- goto out;
+ goto out_mdiobus;

acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_HANDLE(dev), 1,
acpi_register_phy, NULL, mdio_bus, NULL);
@@ -426,16 +431,20 @@ static int xgene_mdio_probe(struct platform_device *pdev)
}

if (ret)
- goto out;
+ goto out_mdiobus;

pdata->mdio_bus = mdio_bus;
xgene_mdio_status = true;

return 0;

-out:
+out_mdiobus:
mdiobus_free(mdio_bus);

+out_clk:
+ if (dev->of_node)
+ clk_disable_unprepare(pdata->clk);
+
return ret;
}

--
2.7.4

2017-12-18 03:12:41

by Quan Nguyen

Subject: Re: [PATCH] net: phy: xgene: disable clk on error paths

On Sat, Dec 16, 2017 at 4:52 AM, Alexey Khoroshilov
<[email protected]> wrote:
>
> There are several error paths in xgene_mdio_probe(),
> where clk is left undisabled. The patch fixes them.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <[email protected]>
> ---
> drivers/net/phy/mdio-xgene.c | 21 +++++++++++++++------
> 1 file changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/phy/mdio-xgene.c b/drivers/net/phy/mdio-xgene.c
> index bfd3090fb055..07c6048200c6 100644
> --- a/drivers/net/phy/mdio-xgene.c
> +++ b/drivers/net/phy/mdio-xgene.c
> @@ -194,8 +194,11 @@ static int xgene_mdio_reset(struct xgene_mdio_pdata *pdata)
> }
>
> ret = xgene_enet_ecc_init(pdata);
> - if (ret)
> + if (ret) {
> + if (pdata->dev->of_node)
> + clk_disable_unprepare(pdata->clk);
> return ret;
> + }
> xgene_gmac_reset(pdata);
>
> return 0;
> @@ -388,8 +391,10 @@ static int xgene_mdio_probe(struct platform_device *pdev)
> return ret;
>
> mdio_bus = mdiobus_alloc();
> - if (!mdio_bus)
> - return -ENOMEM;
> + if (!mdio_bus) {
> + ret = -ENOMEM;
> + goto out_clk;
> + }
>
> mdio_bus->name = "APM X-Gene MDIO bus";
>
> @@ -418,7 +423,7 @@ static int xgene_mdio_probe(struct platform_device *pdev)
> mdio_bus->phy_mask = ~0;
> ret = mdiobus_register(mdio_bus);
> if (ret)
> - goto out;
> + goto out_mdiobus;
>
> acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_HANDLE(dev), 1,
> acpi_register_phy, NULL, mdio_bus, NULL);
> @@ -426,16 +431,20 @@ static int xgene_mdio_probe(struct platform_device *pdev)
> }
>
> if (ret)
> - goto out;
> + goto out_mdiobus;
>
> pdata->mdio_bus = mdio_bus;
> xgene_mdio_status = true;
>
> return 0;
>
> -out:
> +out_mdiobus:
> mdiobus_free(mdio_bus);
>
> +out_clk:
> + if (dev->of_node)
> + clk_disable_unprepare(pdata->clk);
> +
> return ret;
> }
>

Acked.

2017-12-18 20:10:11

by David Miller

Subject: Re: [PATCH] net: phy: xgene: disable clk on error paths

From: Alexey Khoroshilov <[email protected]>
Date: Sat, 16 Dec 2017 00:52:39 +0300

> There are several error paths in xgene_mdio_probe(),
> where clk is left undisabled. The patch fixes them.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <[email protected]>

Applied, thank you.