Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d434d83 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

regmap: fix NULL deref on lookup



commit c6df843348d6b71ea986266c12831cb60c2cf325 upstream.

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: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20231006082104.16707-1-johan+linaro@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 76050b0c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1363,7 +1363,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;
}