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

Commit ed26f87b authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Lee Jones
Browse files

mfd: max8998: Fix possible NULL pointer dereference on i2c_new_dummy error 



During probe the driver allocates dummy I2C device for RTC with i2c_new_dummy() but it does not check the return value of this call.

In case of error (i2c_new_device(): memory allocation failure or I2C
address cannot be used) this function returns NULL which is later used
by i2c_unregister_device().

If i2c_new_dummy() fails for RTC device, fail also the probe for
main MFD driver.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent b9e183a1

drivers/mfd/max8998.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -215,6 +215,10 @@ static int max8998_i2c_probe(struct i2c_client *i2c, 
	mutex_init(&max8998->iolock);

	mutex_init(&max8998->iolock);





	max8998->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);

	max8998->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);

	if (!max8998->rtc) {

		dev_err(&i2c->dev, "Failed to allocate I2C device for RTC\n");

		return -ENODEV;

	}

	i2c_set_clientdata(max8998->rtc, max8998);

	i2c_set_clientdata(max8998->rtc, max8998);





	max8998_irq_init(max8998);

	max8998_irq_init(max8998);