]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
gpio: stm32: check result of ofnode_phandle_args
authorPatrick Delaunay <patrick.delaunay@st.com>
Wed, 9 Sep 2020 16:28:34 +0000 (18:28 +0200)
committerPatrick Delaunay <patrick.delaunay@st.com>
Fri, 2 Oct 2020 13:05:14 +0000 (15:05 +0200)
Add test on the size of ofnode_phandle_args result to avoid access
to uninitialized elements in args[] field.

This patch avoids the issue when gpio-ranges cell size is not 3 as
expected, for example:
gpio-ranges = <&pinctrl 0>;
instead of
gpio-ranges = <&pinctrl 0 112 16>;

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
drivers/gpio/stm32_gpio.c

index aa70b1d2a9d9c248a73de515b81e6f3189af3e8e..473e364796f378ffe0a933cb7de6d906ead50009 100644 (file)
@@ -295,6 +295,9 @@ static int gpio_stm32_probe(struct udevice *dev)
        ret = dev_read_phandle_with_args(dev, "gpio-ranges",
                                         NULL, 3, i, &args);
 
+       if (!ret && args.args_count < 3)
+               return -EINVAL;
+
        if (ret == -ENOENT) {
                uc_priv->gpio_count = STM32_GPIOS_PER_BANK;
                priv->gpio_range = GENMASK(STM32_GPIOS_PER_BANK - 1, 0);
@@ -308,6 +311,8 @@ static int gpio_stm32_probe(struct udevice *dev)
 
                ret = dev_read_phandle_with_args(dev, "gpio-ranges", NULL, 3,
                                                 ++i, &args);
+               if (!ret && args.args_count < 3)
+                       return -EINVAL;
        }
 
        dev_dbg(dev, "addr = 0x%p bank_name = %s gpio_count = %d gpio_range = 0x%x\n",