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

Commit 17649c90 authored by Sergey SENOZHATSKY's avatar Sergey SENOZHATSKY Committed by Mark Brown
Browse files

regmap: fix a NULL pointer dereference in __regmap_init 



__regmap_init() may receive a NULL `struct regmap_bus *bus' pointer,
for example, from snd_hdac_regmap_init(), and it make sure that it
does not NULL deference `bus`, except around ->max_raw_read and
->max_raw_write initialisation. Add missing check.

Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29332534

drivers/base/regmap/regmap.c

+4 −2
Original line number Diff line number Diff line
@@ -579,8 +579,10 @@ struct regmap *regmap_init(struct device *dev, 
	map->use_single_read = config->use_single_rw || !bus || !bus->read;

	map->use_single_write = config->use_single_rw || !bus || !bus->write;

	map->can_multi_write = config->can_multi_write && bus && bus->write;

	if (bus) {

		map->max_raw_read = bus->max_raw_read;

		map->max_raw_write = bus->max_raw_write;

	}

	map->dev = dev;

	map->bus = bus;

	map->bus_context = bus_context;