[PATCH 5.10] regmap: cache: Add extra parameter check in regcache_init

Roman Smirnov posted 1 patch 2 months, 1 week ago
drivers/base/regmap/regcache.c | 6 ++++++
1 file changed, 6 insertions(+)
[PATCH 5.10] regmap: cache: Add extra parameter check in regcache_init
Posted by Roman Smirnov 2 months, 1 week ago
From: Schspa Shi <schspa@gmail.com>

commit a5201d42e2f8a8e8062103170027840ee372742f upstream.

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.

Signed-off-by: Schspa Shi <schspa@gmail.com>
Link: https://lore.kernel.org/r/20220629130951.63040-1-schspa@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Roman Smirnov <r.smirnov@omp.ru>
---
 drivers/base/regmap/regcache.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 7fdd702e564a..5ff79ba665ad 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -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;
-- 
2.34.1