samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

touch: exit in probe

Browse Source 
Adjust exit labels to avoid the use-after-free issue.

Change-Id: I46368c80014aa3cbb680cf6e9967e20e188c1340
Signed-off-by: Srikanth Katteboina <quic_skattebo@quicinc.com>
This commit is contained in:
Srikanth Katteboina
2022-09-16 19:36:22 +05:30
committed by ppadasal
parent 03bb25d1f1
commit dedef8c90d
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
raydium/raydium_driver.c
View File

@@ -1867,13 +1867,15 @@ static int raydium_get_regulator(struct raydium_ts_data *cd, bool get)
regulator_put:
#ifdef VDD_ANALOG_ENABLE
if (cd->vdd) {
if (!IS_ERR(cd->vdd)) {
dev_err(&cd->client->dev, "Regulator put vdd\n");
regulator_put(cd->vdd);
cd->vdd = NULL;
}
#endif
if (cd->vcc_i2c) {
if (!IS_ERR(cd->vcc_i2c)) {
dev_err(&cd->client->dev, "Regulator put vcc_i2c\n");
regulator_put(cd->vcc_i2c);
cd->vcc_i2c = NULL;
}
@@ -2063,9 +2065,9 @@ static int raydium_ts_probe(struct i2c_client *client,
/*print touch i2c ready*/
ret = raydium_check_i2c_ready(&u16_i2c_data);
if (ret < 0) {
if (ret < 0 || (u16_i2c_data == 0)) {
LOGD(LOG_ERR, "[touch]Check I2C failed\n");
ret = -ENODEV;
ret = -EPROBE_DEFER;
goto exit_check_i2c;
}
@@ -2143,6 +2145,8 @@ static int raydium_ts_probe(struct i2c_client *client,
ret = -ENODEV;
goto exit_irq_request_failed;
}
LOGD(LOG_INFO, "[touch] probe: done\n");
return 0;
exit_irq_request_failed:
@@ -2158,6 +2162,20 @@ exit_input_register_device_failed:
exit_input_dev_alloc_failed:
exit_check_i2c:
#ifdef MSM_NEW_VER
if (g_raydium_ts->ts_pinctrl) {
if (IS_ERR_OR_NULL(g_raydium_ts->pinctrl_state_release)) {
devm_pinctrl_put(g_raydium_ts->ts_pinctrl);
g_raydium_ts->ts_pinctrl = NULL;
} else {
if (pinctrl_select_state(g_raydium_ts->ts_pinctrl,
g_raydium_ts->pinctrl_state_release))
LOGD(LOG_ERR,
"[touch]pinctrl_select_state failed\n");
}
}
#endif/*end of MSM_NEW_VER*/
if (gpio_is_valid(pdata->reset_gpio))
gpio_free(pdata->reset_gpio);
@@ -2165,24 +2183,11 @@ exit_check_i2c:
gpio_free(pdata->irq_gpio);
err_gpio_req:
#ifdef MSM_NEW_VER
if (g_raydium_ts->ts_pinctrl) {
if (IS_ERR_OR_NULL(g_raydium_ts->pinctrl_state_release)) {
devm_pinctrl_put(g_raydium_ts->ts_pinctrl);
g_raydium_ts->ts_pinctrl = NULL;
} else {
ret = pinctrl_select_state(g_raydium_ts->ts_pinctrl,
g_raydium_ts->pinctrl_state_release);
if (ret)
LOGD(LOG_ERR, "[touch]pinctrl_select_state failed\n");
}
}
#endif/*end of MSM_NEW_VER*/
raydium_get_regulator(g_raydium_ts, false);
error_get_regulator:
raydium_get_regulator(g_raydium_ts, false);
error_alloc_data:
kfree(g_raydium_ts);
parse_dt_failed:
exit_check_functionality_failed:
return ret;