regulator: gpio: Fix the out-of-bounds access to drvdata::gpiods

drvdata::gpiods is supposed to hold an array of 'gpio_desc' pointers. But
the memory is allocated for only one pointer. This will lead to
out-of-bounds access later in the code if 'config::ngpios' is > 1. So
fix the code to allocate enough memory to hold 'config::ngpios' of GPIO
descriptors.

While at it, also move the check for memory allocation failure to be below
the allocation to make it more readable.

Cc: stable@vger.kernel.org # 5.0
Fixes: d6cd33ad7102 ("regulator: gpio: Convert to use descriptors")
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
Link: https://patch.msgid.link/20250703103549.16558-1-mani@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 75bd53445ba786698ef6763334ef7e6b21560ce5..6351ceefdb3e13485870e1fb98e7567d9e3f996a 100644 (file)
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -260,8 +260,10 @@ static int gpio_regulator_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       drvdata->gpiods = devm_kzalloc(dev, sizeof(struct gpio_desc *),
-                                      GFP_KERNEL);
+       drvdata->gpiods = devm_kcalloc(dev, config->ngpios,
+                                      sizeof(struct gpio_desc *), GFP_KERNEL);
+       if (!drvdata->gpiods)
+               return -ENOMEM;
 
        if (config->input_supply) {
                drvdata->desc.supply_name = devm_kstrdup(&pdev->dev,
@@ -274,8 +276,6 @@ static int gpio_regulator_probe(struct platform_device *pdev)
                }
        }
 
-       if (!drvdata->gpiods)
-               return -ENOMEM;
        for (i = 0; i < config->ngpios; i++) {
                drvdata->gpiods[i] = devm_gpiod_get_index(dev,
                                                          NULL,