Commit bffdf9d7 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: edt-ft5x06 - fix regmap leak when probe fails 



The driver neglects to free the instance of I2C regmap constructed at
the beginning of the edt_ft5x06_ts_probe() method when probe fails.
Additionally edt_ft5x06_ts_remove() is freeing the regmap too early,
before the rest of the device resources that are managed by devm are
released.

Fix this by installing a custom devm action that will ensure that the
regmap is released at the right time during normal teardown as well as
in case of probe failure.

Note that devm_regmap_init_i2c() could not be used because the driver
may replace the original regmap with a regmap specific for M06 devices
in the middle of the probe, and using devm_regmap_init_i2c() would
result in releasing the M06 regmap too early.

Reported-by: default avatarLi Zetao <lizetao1@huawei.com>
Fixes: 9dfd9708 ("Input: edt-ft5x06 - convert to use regmap API")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarOliver Graute <oliver.graute@kococonnector.com>
Link: https://lore.kernel.org/r/ZxL6rIlVlgsAu-Jv@google.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 2de01e0e

drivers/input/touchscreen/edt-ft5x06.c

+18 −1
Original line number Diff line number Diff line
@@ -1121,6 +1121,14 @@ static void edt_ft5x06_ts_set_regs(struct edt_ft5x06_ts_data *tsdata) 
	}

}



static void edt_ft5x06_exit_regmap(void *arg)

{

	struct edt_ft5x06_ts_data *data = arg;



	if (!IS_ERR_OR_NULL(data->regmap))

		regmap_exit(data->regmap);

}



static void edt_ft5x06_disable_regulators(void *arg)

{

	struct edt_ft5x06_ts_data *data = arg;
@@ -1154,6 +1162,16 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client) 
		return PTR_ERR(tsdata->regmap);

	}



	/*

	 * We are not using devm_regmap_init_i2c() and instead install a

	 * custom action because we may replace regmap with M06-specific one

	 * and we need to make sure that it will not be released too early.

	 */

	error = devm_add_action_or_reset(&client->dev, edt_ft5x06_exit_regmap,

					 tsdata);

	if (error)

		return error;



	chip_data = device_get_match_data(&client->dev);

	if (!chip_data)

		chip_data = (const struct edt_i2c_chip_data *)id->driver_data;
@@ -1347,7 +1365,6 @@ static void edt_ft5x06_ts_remove(struct i2c_client *client) 
	struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client);



	edt_ft5x06_ts_teardown_debugfs(tsdata);

	regmap_exit(tsdata->regmap);

}



static int edt_ft5x06_ts_suspend(struct device *dev)