net: stmmac: add sanity check to device_property_read_u32_array call
authorColin Ian King <colin.king@canonical.com>
Mon, 17 Jun 2019 16:58:36 +0000 (17:58 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Jun 2019 01:03:38 +0000 (21:03 -0400)
Currently the call to device_property_read_u32_array is not error checked
leading to potential garbage values in the delays array that are then used
in msleep delays.  Add a sanity check to the property fetching.

Addresses-Coverity: ("Uninitialized scalar variable")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

index da310de06bf6af803eb15c378afaa2367c804dc1..5b7923c0698cc7a7027e6f22f229025e77feaa43 100644 (file)
@@ -242,6 +242,7 @@ int stmmac_mdio_reset(struct mii_bus *bus)
        if (priv->device->of_node) {
                struct gpio_desc *reset_gpio;
                u32 delays[3];
+               int ret;
 
                reset_gpio = devm_gpiod_get_optional(priv->device,
                                                     "snps,reset",
@@ -249,9 +250,15 @@ int stmmac_mdio_reset(struct mii_bus *bus)
                if (IS_ERR(reset_gpio))
                        return PTR_ERR(reset_gpio);
 
-               device_property_read_u32_array(priv->device,
-                                              "snps,reset-delays-us",
-                                              delays, ARRAY_SIZE(delays));
+               ret = device_property_read_u32_array(priv->device,
+                                                    "snps,reset-delays-us",
+                                                    delays,
+                                                    ARRAY_SIZE(delays));
+               if (ret) {
+                       dev_err(ndev->dev.parent,
+                               "invalid property snps,reset-delays-us\n");
+                       return -EINVAL;
+               }
 
                if (delays[0])
                        msleep(DIV_ROUND_UP(delays[0], 1000));