github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: atomisp: gc2235: fix UAF and memory leak

Browse Source 
gc2235_probe() handles its error paths incorrectly.

If media_entity_pads_init() fails, gc2235_remove() is called, which
tears down the subdev and frees dev, but then still falls through to
atomisp_register_i2c_module(). This results in use-after-free.

If atomisp_register_i2c_module() fails, the media entity and control
handler are left initialized and dev is leaked.

gc2235_remove() unconditionally calls media_entity_cleanup() and
v4l2_ctrl_handler_free(), but these are not initialized at every
error path in gc2235_probe().

Replace gc2235_remove() calls in the probe error paths with explicit
unwind labels that free only the resources initialized at each point
of failure, in reverse order of initialization.

Fixes: a49d25364d ("staging/atomisp: Add support for the Intel IPU v2")
Signed-off-by: Yuho Choi <dbgh9129@gmail.com>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
This commit is contained in:
Yuho Choi 2026-04-02 20:23:19 -04:00 committed by Sakari Ailus
parent 2ebf05cc41
commit 628f763aee
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
View File

@ -809,7 +809,7 @@ static int gc2235_probe(struct i2c_client *client)
ret = gc2235_s_config(&dev->sd, client->irq, gcpdev);
if (ret)
goto out_free;
goto err_unregister_subdev;
dev->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
dev->pad.flags = MEDIA_PAD_FL_SOURCE;
@ -818,18 +818,16 @@ static int gc2235_probe(struct i2c_client *client)
ret =
v4l2_ctrl_handler_init(&dev->ctrl_handler,
ARRAY_SIZE(gc2235_controls));
if (ret) {
gc2235_remove(client);
return ret;
}
if (ret)
goto err_csi_cfg;
for (i = 0; i < ARRAY_SIZE(gc2235_controls); i++)
v4l2_ctrl_new_custom(&dev->ctrl_handler, &gc2235_controls[i],
NULL);
if (dev->ctrl_handler.error) {
gc2235_remove(client);
return dev->ctrl_handler.error;
ret = dev->ctrl_handler.error;
goto err_ctrl_handler;
}
/* Use same lock for controls as for everything else. */
@ -838,14 +836,23 @@ static int gc2235_probe(struct i2c_client *client)
ret = media_entity_pads_init(&dev->sd.entity, 1, &dev->pad);
if (ret)
gc2235_remove(client);
goto err_ctrl_handler;
return atomisp_register_i2c_module(&dev->sd, gcpdev);
ret = atomisp_register_i2c_module(&dev->sd, gcpdev);
if (ret)
goto err_media_cleanup;
out_free:
return 0;
err_media_cleanup:
media_entity_cleanup(&dev->sd.entity);
err_ctrl_handler:
v4l2_ctrl_handler_free(&dev->ctrl_handler);
err_csi_cfg:
dev->platform_data->csi_cfg(&dev->sd, 0);
err_unregister_subdev:
v4l2_device_unregister_subdev(&dev->sd);
kfree(dev);
return ret;
}