lkml.org 
[lkml]   [2019]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net] net: cpsw: fix NULL pointer exception in the probe error path
    Date
    In certain cases when the probe function fails the error path calls
    cpsw_remove_dt() before calling platform_set_drvdata(). This is an
    issue as cpsw_remove_dt() uses platform_get_drvdata() to retrieve the
    cpsw_common data and leds to a NULL pointer exception. This patches
    fixes it by calling platform_set_drvdata() earlier in the probe.

    Fixes: 83a8471ba255 ("net: ethernet: ti: cpsw: refactor probe to group common hw initialization")
    Reported-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
    Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
    ---
    drivers/net/ethernet/ti/cpsw.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
    index 32a89744972d..a46b8b2e44e1 100644
    --- a/drivers/net/ethernet/ti/cpsw.c
    +++ b/drivers/net/ethernet/ti/cpsw.c
    @@ -2775,6 +2775,7 @@ static int cpsw_probe(struct platform_device *pdev)
    if (!cpsw)
    return -ENOMEM;

    + platform_set_drvdata(pdev, cpsw);
    cpsw->dev = dev;

    mode = devm_gpiod_get_array_optional(dev, "mode", GPIOD_OUT_LOW);
    @@ -2879,7 +2880,6 @@ static int cpsw_probe(struct platform_device *pdev)
    goto clean_cpts;
    }

    - platform_set_drvdata(pdev, cpsw);
    priv = netdev_priv(ndev);
    priv->cpsw = cpsw;
    priv->ndev = ndev;
    --
    2.21.0
    \
     
     \ /
      Last update: 2019-08-21 16:45    [W:2.318 / U:0.724 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site