forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

media: [next] staging: media: atomisp: fix memory leak of object flash

Browse source 
[ Upstream commit 6045b01dd0 ]

In the case where the call to lm3554_platform_data_func returns an
error there is a memory leak on the error return path of object
flash.  Fix this by adding an error return path that will free
flash and rename labels fail2 to fail3 and fail1 to fail2.

Link: https://lore.kernel.org/linux-media/20200902165852.201155-1-colin.king@canonical.com
Fixes: 9289cdf399 ("staging: media: atomisp: Convert to GPIO descriptors")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Colin Ian King 2020-09-02 18:58:52 +02:00 • committed by Greg Kroah-Hartman
commit cc4cc2fb5a
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
View file

@ -843,8 +843,10 @@ static int lm3554_probe(struct i2c_client *client)
return -ENOMEM;
flash->pdata = lm3554_platform_data_func(client);
if (IS_ERR(flash->pdata))
return PTR_ERR(flash->pdata);
if (IS_ERR(flash->pdata)) {
err = PTR_ERR(flash->pdata);
goto fail1;
}
v4l2_i2c_subdev_init(&flash->sd, client, &lm3554_ops);
flash->sd.internal_ops = &lm3554_internal_ops;
@ -856,7 +858,7 @@ static int lm3554_probe(struct i2c_client *client)
ARRAY_SIZE(lm3554_controls));
if (ret) {
dev_err(&client->dev, "error initialize a ctrl_handler.\n");
goto fail2;
goto fail3;
}
for (i = 0; i < ARRAY_SIZE(lm3554_controls); i++)
@ -865,14 +867,14 @@ static int lm3554_probe(struct i2c_client *client)
if (flash->ctrl_handler.error) {
dev_err(&client->dev, "ctrl_handler error.\n");
goto fail2;
goto fail3;
}
flash->sd.ctrl_handler = &flash->ctrl_handler;
err = media_entity_pads_init(&flash->sd.entity, 0, NULL);
if (err) {
dev_err(&client->dev, "error initialize a media entity.\n");
goto fail1;
goto fail2;
}
flash->sd.entity.function = MEDIA_ENT_F_FLASH;
@ -884,14 +886,15 @@ static int lm3554_probe(struct i2c_client *client)
err = lm3554_gpio_init(client);
if (err) {
dev_err(&client->dev, "gpio request/direction_output fail");
goto fail2;
goto fail3;
}
return atomisp_register_i2c_module(&flash->sd, NULL, LED_FLASH);
fail2:
fail3:
media_entity_cleanup(&flash->sd.entity);
v4l2_ctrl_handler_free(&flash->ctrl_handler);
fail1:
fail2:
v4l2_device_unregister_subdev(&flash->sd);
fail1:
kfree(flash);
return err;