evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iio: hmc5843: fix potential NULL pointer dereferences

Browse source 
[ Upstream commit 536cc27deade8f1ec3c1beefa60d5fbe0f6fcb28 ]

devm_regmap_init_i2c may fail and return NULL. The fix returns
the error when it fails.

Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Kangjie Lu 2019-03-16 17:08:33 -05:00 • committed by Greg Kroah-Hartman
parent a86d061794
commit e98ef6767e
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/staging/iio/magnetometer/hmc5843_i2c.c
View file

@ -59,8 +59,13 @@ static const struct regmap_config hmc5843_i2c_regmap_config = {
static int hmc5843_i2c_probe(struct i2c_client *cli, static int hmc5843_i2c_probe(struct i2c_client *cli,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct regmap *regmap = devm_regmap_init_i2c(cli,
&hmc5843_i2c_regmap_config);
if (IS_ERR(regmap))
return PTR_ERR(regmap);
return hmc5843_common_probe(&cli->dev, return hmc5843_common_probe(&cli->dev,
devm_regmap_init_i2c(cli, &hmc5843_i2c_regmap_config), regmap,
id->driver_data, id->name); id->driver_data, id->name);
} }

7
drivers/staging/iio/magnetometer/hmc5843_spi.c
View file

@ -59,6 +59,7 @@ static const struct regmap_config hmc5843_spi_regmap_config = {
static int hmc5843_spi_probe(struct spi_device *spi) static int hmc5843_spi_probe(struct spi_device *spi)
{ {
int ret; int ret;
struct regmap *regmap;
const struct spi_device_id *id = spi_get_device_id(spi); const struct spi_device_id *id = spi_get_device_id(spi);
spi->mode = SPI_MODE_3; spi->mode = SPI_MODE_3;
@ -68,8 +69,12 @@ static int hmc5843_spi_probe(struct spi_device *spi)
if (ret) if (ret)
return ret; return ret;
regmap = devm_regmap_init_spi(spi, &hmc5843_spi_regmap_config);
if (IS_ERR(regmap))
return PTR_ERR(regmap);
return hmc5843_common_probe(&spi->dev, return hmc5843_common_probe(&spi->dev,
devm_regmap_init_spi(spi, &hmc5843_spi_regmap_config), regmap,
id->driver_data, id->name); id->driver_data, id->name);
} }