diff options
| author | Johan Hovold <jhovold@gmail.com> | 2014-05-08 10:09:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-30 20:09:41 -0700 |
| commit | e0fc51f96172f207cf4cb276e6a31a5d438f6b06 (patch) | |
| tree | 05d1320f7c89d4e06414a496d7fc1427076b043f /drivers/net | |
| parent | f6e39ac6156b2b46584d2dbbd4c2ead95e883552 (diff) | |
| download | linux-3.10-e0fc51f96172f207cf4cb276e6a31a5d438f6b06.tar.gz linux-3.10-e0fc51f96172f207cf4cb276e6a31a5d438f6b06.tar.bz2 linux-3.10-e0fc51f96172f207cf4cb276e6a31a5d438f6b06.zip | |
net: cpsw: fix null dereference at probe
commit 6954cc1f238199e971ec905c5cc87120806ac981 upstream.
Fix null-pointer dereference at probe when the mdio platform device is
missing (e.g. when it has been disabled in DT).
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index d1a769f35f9..b1ab3a4956a 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1547,6 +1547,10 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, mdio_node = of_find_node_by_phandle(be32_to_cpup(parp)); phyid = be32_to_cpup(parp+1); mdio = of_find_device_by_node(mdio_node); + if (!mdio) { + pr_err("Missing mdio platform device\n"); + return -EINVAL; + } snprintf(slave_data->phy_id, sizeof(slave_data->phy_id), PHY_ID_FMT, mdio->name, phyid); |