diff options
| author | Johan Hovold <johan+linaro@kernel.org> | 2023-10-06 11:21:04 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-10-09 15:13:53 +0300 |
| commit | c6df843348d6b71ea986266c12831cb60c2cf325 (patch) | |
| tree | 4e5e25e0d59f3c2538c3428124cad853d87d7f6a /drivers/base/regmap/regmap.c | |
| parent | 7a795ac8d49e2433e1b97caf5e99129daf8e1b08 (diff) | |
| download | linux-c6df843348d6b71ea986266c12831cb60c2cf325.tar.xz | |
regmap: fix NULL deref on lookup
Not all regmaps have a name so make sure to check for that to avoid
dereferencing a NULL pointer when dev_get_regmap() is used to lookup a
named regmap.
Fixes: e84861fec32d ("regmap: dev_get_regmap_match(): fix string comparison")
Cc: stable@vger.kernel.org # 5.8
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20231006082104.16707-1-johan+linaro@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/base/regmap/regmap.c')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 884cb51c8f67..234a84ecde8b 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1478,7 +1478,7 @@ static int dev_get_regmap_match(struct device *dev, void *res, void *data) /* If the user didn't specify a name match any */ if (data) - return !strcmp((*r)->name, data); + return (*r)->name && !strcmp((*r)->name, data); else return 1; } |