Skip to contentSkip to conversation

regmap: cache: Add extra parameter check in regcache_init

PATCH In review Schspa Shi 2 participants 2 messages Jun 29, 2022 – Jun 30, 2022

Subsystems (2)
lore
Share & tools
lore

Schspa Shi

author
#0 lore raw

PATCH 1/1 regmap: cache: Add extra parameter check in regcache_init

When num_reg_defaults > 0 but reg_defaults is NULL, there will be a NULL pointer exception.

Current code has no such usage, but as additional hardening, also check this to prevent any chance of crashing.

---
 drivers/base/regmap/regcache.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/base/regmap/regcache.c +6 -0
index d0f5bc827978..d8c31c8ac4a0 100644
@@ -133,6 +133,12 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
 		return -EINVAL;
 	}
 
+	if (config->num_reg_defaults && !config->reg_defaults) {
+		dev_err(map->dev,
+			"Register defaults number are set without the reg!\n");
+		return -EINVAL;
+	}
+
 	for (i = 0; i < config->num_reg_defaults; i++)
 		if (config->reg_defaults[i].reg % map->reg_stride)
 			return -EINVAL;
Signature · 1 line
2.29.0
maintainer
#1 lore raw
Quoted 8 lines · Schspa Shi

When num_reg_defaults > 0 but reg_defaults is NULL, there will be a NULL pointer exception.

Current code has no such usage, but as additional hardening, also check this to prevent any chance of crashing.

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-next

Thanks!

[1/1] regmap: cache: Add extra parameter check in regcache_init

      commit: a5201d42e2f8a8e8062103170027840ee372742f

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark