releases/4.14.60/net-ethernet-ti-cpsw-phy-sel-check-bus_find_device-ret-value.patch

   1 From foo@baz Sat Jul 28 10:25:26 CEST 2018
   2 From: Grygorii Strashko <grygorii.strashko@ti.com>
   3 Date: Tue, 15 May 2018 18:37:25 -0500
   4 Subject: net: ethernet: ti: cpsw-phy-sel: check bus_find_device() ret value
   5
   6 From: Grygorii Strashko <grygorii.strashko@ti.com>
   7
   8 [ Upstream commit c6213eb1aee308e67377fd1890d84f7284caf531 ]
   9
  10 This fixes klockworks warnings: Pointer 'dev' returned from call to
  11 function 'bus_find_device' at line 179 may be NULL and will be dereferenced
  12 at line 181.
  13
  14     cpsw-phy-sel.c:179: 'dev' is assigned the return value from function 'bus_find_device'.
  15     bus.c:342: 'bus_find_device' explicitly returns a NULL value.
  16     cpsw-phy-sel.c:181: 'dev' is dereferenced by passing argument 1 to function 'dev_get_drvdata'.
  17     device.h:1024: 'dev' is passed to function 'dev_get_drvdata'.
  18     device.h:1026: 'dev' is explicitly dereferenced.
  19
  20 Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
  21 [nsekhar@ti.com: add an error message, fix return path]
  22 Signed-off-by: Sekhar Nori <nsekhar@ti.com>
  23 Signed-off-by: David S. Miller <davem@davemloft.net>
  24 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  25 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  26 ---
  27  drivers/net/ethernet/ti/cpsw-phy-sel.c |    8 +++++++-
  28  1 file changed, 7 insertions(+), 1 deletion(-)
  29
  30 --- a/drivers/net/ethernet/ti/cpsw-phy-sel.c
  31 +++ b/drivers/net/ethernet/ti/cpsw-phy-sel.c
  32 @@ -177,12 +177,18 @@ void cpsw_phy_sel(struct device *dev, ph
  33         }
  34
  35         dev = bus_find_device(&platform_bus_type, NULL, node, match);
  36 -       of_node_put(node);
  37 +       if (!dev) {
  38 +               dev_err(dev, "unable to find platform device for %pOF\n", node);
  39 +               goto out;
  40 +       }
  41 +
  42         priv = dev_get_drvdata(dev);
  43
  44         priv->cpsw_phy_sel(priv, phy_mode, slave);
  45
  46         put_device(dev);
  47 +out:
  48 +       of_node_put(node);
  49  }
  50  EXPORT_SYMBOL_GPL(cpsw_phy_sel);
  51