hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: tlv320aic3x: Fix null pointer dereference when pdata is not set 

Null pointer dereference will occur from *setup = pdata->setup if pdata
is not set. Fix this by moving assignments from pdata inside non-null case.

Thanks to Jiri Slaby <jirislaby@gmail.com> for noticing.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
Jarkko Nikula 2010-09-05 19:10:22 +03:00 committed by Liam Girdwood
parent 098b171823
commit c776357e0a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/codecs/tlv320aic3x.c
View File

@ -1360,7 +1360,6 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct aic3x_pdata *pdata = i2c->dev.platform_data; struct aic3x_pdata *pdata = i2c->dev.platform_data;
struct aic3x_setup_data *setup = pdata->setup;
struct aic3x_priv *aic3x; struct aic3x_priv *aic3x;
int ret, i; int ret, i;
const struct i2c_device_id *tbl; const struct i2c_device_id *tbl;
@ -1372,15 +1371,18 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
} }
aic3x->control_data = i2c; aic3x->control_data = i2c;
aic3x->setup = setup;
i2c_set_clientdata(i2c, aic3x); i2c_set_clientdata(i2c, aic3x);
if (pdata) {
aic3x->gpio_reset = pdata->gpio_reset;
aic3x->setup = pdata->setup;
} else {
aic3x->gpio_reset = -1;
}
aic3x->gpio_reset = -1; if (aic3x->gpio_reset >= 0) {
if (pdata && pdata->gpio_reset >= 0) { ret = gpio_request(aic3x->gpio_reset, "tlv320aic3x reset");
ret = gpio_request(pdata->gpio_reset, "tlv320aic3x reset");
if (ret != 0) if (ret != 0)
goto err_gpio; goto err_gpio;
aic3x->gpio_reset = pdata->gpio_reset;
gpio_direction_output(aic3x->gpio_reset, 0); gpio_direction_output(aic3x->gpio_reset, 0);
} }