michael/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit c9764fd88b ]

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: d6cd33ad71 ("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>
This commit is contained in:
Manivannan Sadhasivam
2025-07-03 16:05:49 +05:30
committed by Greg Kroah-Hartman
parent 285e4fb525
commit a3cd5ae7be
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/regulator/gpio-regulator.c
View File

@@ -253,8 +253,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,
@@ -267,8 +269,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,