]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mdio-sun4i: oops in error handling in probe
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 21 Mar 2016 09:02:31 +0000 (12:02 +0300)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 30 Apr 2016 22:06:03 +0000 (00:06 +0200)
commit 227f33beab746aeec4ef3305bd17b1d374df09e7 upstream.

We could end up dereferencing an error pointer when we call
regulator_disable().

Fixes: 4bdcb1dd9feb ('net: Add MDIO bus driver for the Allwinner EMAC')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/net/phy/mdio-sun4i.c

index 15bc7f9ea224b44daab666cab2ff62c4e61019b5..529bed2dd3f755a315881a5d6b33ac56f7fa9d44 100644 (file)
@@ -132,6 +132,7 @@ static int sun4i_mdio_probe(struct platform_device *pdev)
                        return -EPROBE_DEFER;
 
                dev_info(&pdev->dev, "no regulator found\n");
+               data->regulator = NULL;
        } else {
                ret = regulator_enable(data->regulator);
                if (ret)
@@ -147,7 +148,8 @@ static int sun4i_mdio_probe(struct platform_device *pdev)
        return 0;
 
 err_out_disable_regulator:
-       regulator_disable(data->regulator);
+       if (data->regulator)
+               regulator_disable(data->regulator);
 err_out_free_mdiobus:
        mdiobus_free(bus);
        return ret;