linux-kernel - [PATCH 5.10] regmap: cache: Add extra parameter check in regcache

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240917101757.83398-1-r.smirnov@omp.ru>
Date: Tue, 17 Sep 2024 13:17:57 +0300
From: Roman Smirnov <r.smirnov@....ru>
To: <stable@...r.kernel.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Sergey Shtylyov <s.shtylyov@....ru>
CC: Roman Smirnov <r.smirnov@....ru>, Mark Brown <broonie@...nel.org>, "Rafael
 J. Wysocki" <rafael@...nel.org>, <linux-kernel@...r.kernel.org>, Karina
 Yankevich <k.yankevich@....ru>, Sergey Yudin <s.yudin@....ru>,
	<lvc-project@...uxtesting.org>, Schspa Shi <schspa@...il.com>
Subject: [PATCH 5.10] regmap: cache: Add extra parameter check in regcache_init

From: Schspa Shi <schspa@...il.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@...il.com>
Link: https://lore.kernel.org/r/20220629130951.63040-1-schspa@gmail.com
Signed-off-by: Mark Brown <broonie@...nel.org>
Signed-off-by: Roman Smirnov <r.smirnov@....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