]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
regulator: gpio: Fix the out-of-bounds access to drvdata::gpiods
authorManivannan Sadhasivam <mani@kernel.org>
Thu, 3 Jul 2025 10:35:49 +0000 (16:05 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Jul 2025 16:27:49 +0000 (18:27 +0200)
[ Upstream commit c9764fd88bc744592b0604ccb6b6fc1a5f76b4e3 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/regulator/gpio-regulator.c

index 5927d4f3eabd751489c71275452d597f14a6f4fc..de07b16b34f8e48abc392b01eede1d24502a060f 100644 (file)
@@ -257,8 +257,8 @@ 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;
        for (i = 0; i < config->ngpios; i++) {