leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: i2c: tda1997x: prevent potential NULL pointer access

Browse Source 
i2c_new_dummy() can fail returning a NULL pointer. This is not checked
and the returned pointer is blindly used. Convert to
devm_i2c_new_dummy_client() which returns an ERR_PTR and also add a
validity check. Using devm_* here also fixes a leak because the dummy
client was not released in the probe error path.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Wolfram Sang 2019-08-09 13:52:15 -03:00 committed by Mauro Carvalho Chehab
parent 53f5d7a46f
commit 2f822f1da0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/i2c/tda1997x.c
View File

@ -2691,7 +2691,13 @@ static int tda1997x_probe(struct i2c_client *client,
} }
ret = 0x34 + ((io_read(sd, REG_SLAVE_ADDR)>>4) & 0x03); ret = 0x34 + ((io_read(sd, REG_SLAVE_ADDR)>>4) & 0x03);
state->client_cec = i2c_new_dummy(client->adapter, ret); state->client_cec = devm_i2c_new_dummy_device(&client->dev,
client->adapter, ret);
if (IS_ERR(state->client_cec)) {
ret = PTR_ERR(state->client_cec);
goto err_free_mutex;
}
v4l_info(client, "CEC slave address 0x%02x\n", ret); v4l_info(client, "CEC slave address 0x%02x\n", ret);
ret = tda1997x_core_init(sd); ret = tda1997x_core_init(sd);
@ -2798,7 +2804,6 @@ static int tda1997x_remove(struct i2c_client *client)
media_entity_cleanup(&sd->entity); media_entity_cleanup(&sd->entity);
v4l2_ctrl_handler_free(&state->hdl); v4l2_ctrl_handler_free(&state->hdl);
regulator_bulk_disable(TDA1997X_NUM_SUPPLIES, state->supplies); regulator_bulk_disable(TDA1997X_NUM_SUPPLIES, state->supplies);
i2c_unregister_device(state->client_cec);
cancel_delayed_work(&state->delayed_work_enable_hpd); cancel_delayed_work(&state->delayed_work_enable_hpd);
mutex_destroy(&state->page_lock); mutex_destroy(&state->page_lock);
mutex_destroy(&state->lock); mutex_destroy(&state->lock);