: ucc_geth: Fix use-after-of_node_put() in ucc_geth_probe().
Subsystems (2)
David Miller
maintainerPATCH 2/2 : ucc_geth: Fix use-after-of_node_put() in ucc_geth_probe().
We can't put 'mdio' until after we've used it in the fsl_pq_mdio_bus_name() call.
Also fix error return values.
Signed-off-by David S. Miller <[email protected]>
--- drivers/net/ucc_geth.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
drivers/net/ucc_geth.c +6 -5
@@ -3648,15 +3648,16 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma mdio =of_get_parent (phy);if (mdio ==NULL ) -return -1 ; +return -ENODEV ; err =of_address_to_resource (mdio,0 , &res); -of_node_put (mdio); - -if (err) -return -1 ; +if (err) { +of_node_put (mdio); +return err; + }fsl_pq_mdio_bus_name (bus_name, mdio); +of_node_put (mdio);snprintf (ug_info->phy_bus_id,sizeof (ug_info->phy_bus_id),"%s:%02x" , bus_name, *prop); }
Signature · 1 line
1.6.2.1.222.g570cc