Skip to content

Commit c6df843

Browse files
jhovoldbroonie
authored andcommitted
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: e84861f ("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>
1 parent 7a795ac commit c6df843

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/base/regmap/regmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ static int dev_get_regmap_match(struct device *dev, void *res, void *data)
14781478

14791479
/* If the user didn't specify a name match any */
14801480
if (data)
1481-
return !strcmp((*r)->name, data);
1481+
return (*r)->name && !strcmp((*r)->name, data);
14821482
else
14831483
return 1;
14841484
}

0 commit comments

Comments
 (0)