Skip to content

Commit 6b0cd72

Browse files
Demon000broonie
authored andcommitted
regulator: max20086: fix invalid memory access
max20086_parse_regulators_dt() calls of_regulator_match() using an array of struct of_regulator_match allocated on the stack for the matches argument. of_regulator_match() calls devm_of_regulator_put_matches(), which calls devres_alloc() to allocate a struct devm_of_regulator_matches which will be de-allocated using devm_of_regulator_put_matches(). struct devm_of_regulator_matches is populated with the stack allocated matches array. If the device fails to probe, devm_of_regulator_put_matches() will be called and will try to call of_node_put() on that stack pointer, generating the following dmesg entries: max20086 6-0028: Failed to read DEVICE_ID reg: -121 kobject: '\xc0$\xa5\x03' (000000002cebcb7a): is not initialized, yet kobject_put() is being called. Followed by a stack trace matching the call flow described above. Switch to allocating the matches array using devm_kcalloc() to avoid accessing the stack pointer long after it's out of scope. This also has the advantage of allowing multiple max20086 to probe without overriding the data stored inside the global of_regulator_match. Fixes: bfff546 ("regulator: Add MAX20086-MAX20089 driver") Signed-off-by: Cosmin Tanislav <demonsingur@gmail.com> Link: https://patch.msgid.link/20250508064947.2567255-1-demonsingur@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 92a09c4 commit 6b0cd72

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/regulator/max20086-regulator.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static int max20086_regulators_register(struct max20086 *chip)
132132

133133
static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on)
134134
{
135-
struct of_regulator_match matches[MAX20086_MAX_REGULATORS] = { };
135+
struct of_regulator_match *matches;
136136
struct device_node *node;
137137
unsigned int i;
138138
int ret;
@@ -143,6 +143,11 @@ static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on)
143143
return -ENODEV;
144144
}
145145

146+
matches = devm_kcalloc(chip->dev, chip->info->num_outputs,
147+
sizeof(*matches), GFP_KERNEL);
148+
if (!matches)
149+
return -ENOMEM;
150+
146151
for (i = 0; i < chip->info->num_outputs; ++i)
147152
matches[i].name = max20086_output_names[i];
148153

0 commit comments

Comments
 (0)