lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 261/639] net: sh_eth: fix a missing check of of_get_phy_mode
    Date
    From: Kangjie Lu <kjlu@umn.edu>

    [ Upstream commit 035a14e71f27eefa50087963b94cbdb3580d08bf ]

    of_get_phy_mode may fail and return a negative error code;
    the fix checks the return value of of_get_phy_mode and
    returns NULL of it fails.

    Fixes: b356e978e92f ("sh_eth: add device tree support")
    Signed-off-by: Kangjie Lu <kjlu@umn.edu>
    Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
    Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/renesas/sh_eth.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
    index 6068e96f5ac1e..441643670ac0e 100644
    --- a/drivers/net/ethernet/renesas/sh_eth.c
    +++ b/drivers/net/ethernet/renesas/sh_eth.c
    @@ -3133,12 +3133,16 @@ static struct sh_eth_plat_data *sh_eth_parse_dt(struct device *dev)
    struct device_node *np = dev->of_node;
    struct sh_eth_plat_data *pdata;
    const char *mac_addr;
    + int ret;

    pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
    if (!pdata)
    return NULL;

    - pdata->phy_interface = of_get_phy_mode(np);
    + ret = of_get_phy_mode(np);
    + if (ret < 0)
    + return NULL;
    + pdata->phy_interface = ret;

    mac_addr = of_get_mac_address(np);
    if (mac_addr)
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:14    [W:2.063 / U:2.960 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site