media: ov5640: Fix a memory leak when ov5640_probe fails
PATCH 1/1 media: ov5640: Fix a memory leak when ov5640_probe fails
sensor->ctrls.handler is initialized in ov5640_init_controls(), so when the sensor is not connected and ov5640_sensor_resume() fails, sensor->ctrls.handler should be released, otherwise a memory leak will be detected:
unreferenced object 0xc674ca80 (size 64):
comm "swapper/0", pid 1, jiffies 4294938337 (age 204.880s) hex dump (first 32 bytes):
80 55 75 c6 80 54 75 c6 00 55 75 c6 80 52 75 c6 .Uu..Tu..Uu..Ru.
00 53 75 c6 00 00 00 00 00 00 00 00 00 00 00 00 .Su..........Fixes 85644a9b37ec ("media: ov5640: Use runtime PM")
Signed-off-by Xiaolei Wang <[email protected]>
--- drivers/media/i2c/ov5640.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/i2c/ov5640.c +3 -2
@@ -3923,7 +3923,7 @@ static int ov5640_probe(struct i2c_client *client) ret =ov5640_sensor_resume (dev);if (ret) {dev_err (dev,"failed to power on\n" ); - goto entity_cleanup; + goto free_ctrls; }pm_runtime_set_active (dev);
@@ -3948,8 +3948,9 @@ static int ov5640_probe(struct i2c_client *client) err_pm_runtime:pm_runtime_put_noidle (dev);pm_runtime_disable (dev); -v4l2_ctrl_handler_free (&sensor->ctrls.handler);ov5640_sensor_suspend (dev); +free_ctrls: +v4l2_ctrl_handler_free (&sensor->ctrls.handler); entity_cleanup:media_entity_cleanup (&sensor->sd.entity);mutex_destroy (&sensor->lock);
Signature · 1 line
2.25.1