lkml.org 
[lkml]   [2014]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 097/181] net: cpsw: fix null dereference at probe
    Date
    From: Johan Hovold <jhovold@gmail.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/net/ethernet/ti/cpsw.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
    index cc3ce557e4aa..498e808391a9 100644
    --- a/drivers/net/ethernet/ti/cpsw.c
    +++ b/drivers/net/ethernet/ti/cpsw.c
    @@ -1797,6 +1797,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);

    --
    2.0.0


    \
     
     \ /
      Last update: 2014-06-30 19:41    [W:3.816 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site