Fixes and cleanups for atomisp
Subsystems (4)
cover Fixes and cleanups for atomisp
Hi Mauro,
I'm reposting this series [1] as, following the merge window, it now cleanly applies to both Linus' tree and to linux-next. I've made a minor fix to patch #1 (see patch for details) but the other two patches have just been rebased.
Best,
Alex
PATCH 1/3 staging: media: atomisp: Fix error path in lm3554_probe()
The error path for lm3554_probe() contains a number of bugs, including:
* resource leaks
* jumping to error labels out of sequence
* not setting the return value appropriately
Fix it up and give the labels more memorable names.
This issue has existed since the code was originally contributed in
commit a49d25364dfb ("staging/atomisp: Add support for the Intel IPU v2"), although the code was subsequently removed altogether and then
reinstated with commit ad85094b293e ("Revert "media: staging: atomisp: Remove driver"").
Addresses-Coverity: 1496802 ("Resource leaks")
---
v5: Check for error, not success (Dan), but do it correctly cf. v4 :)
v4: Rebase
v3: No changes
v2: Fix a couple more leaks on error path (Dan)
.../media/atomisp/i2c/atomisp-lm3554.c | 55 +++++++++++-------- 1 file changed, 32 insertions(+), 23 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-lm3554.c +32 -23
@@ -833,7 +833,6 @@ static void *lm3554_platform_data_func(struct i2c_client *client)static int lm3554_probe (struct i2c_client *client) { -int err =0 ;struct lm3554 *flash;unsigned int i;int ret;
@@ -843,36 +842,38 @@ 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)) { + ret =PTR_ERR (flash->pdata); + goto err_free_flash; + }v4l2_i2c_subdev_init (&flash->sd, client, &lm3554_ops); flash->sd.internal_ops = &lm3554_internal_ops; flash->sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; flash->mode =ATOMISP_FLASH_MODE_OFF ; flash->timeout =LM3554_MAX_TIMEOUT /LM3554_TIMEOUT_STEPSIZE -1 ; - ret = -v4l2_ctrl_handler_init (&flash->ctrl_handler, -ARRAY_SIZE (lm3554_controls)); + ret =v4l2_ctrl_handler_init (&flash->ctrl_handler, +ARRAY_SIZE (lm3554_controls));if (ret) { -dev_err (&client->dev,"error initialize a ctrl_handler.\n" ); - goto fail2; +dev_err (&client->dev,"error initializing ctrl_handler" ); + goto err_unregister_sd; }for (i =0 ; i <ARRAY_SIZE (lm3554_controls); i++)v4l2_ctrl_new_custom (&flash->ctrl_handler, &lm3554_controls[i],NULL ); -if (flash->ctrl_handler.error) { -dev_err (&client->dev,"ctrl_handler error.\n" ); - goto fail2; + ret = flash->ctrl_handler.error; +if (ret) { +dev_err (&client->dev,"ctrl_handler error" ); + goto err_free_ctrl_handler; } 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; + ret =media_entity_pads_init (&flash->sd.entity,0 ,NULL ); +if (ret) { +dev_err (&client->dev,"error initializing media entity" ); + goto err_free_ctrl_handler; } flash->sd.entity.function =MEDIA_ENT_F_FLASH ;
@@ -881,20 +882,28 @@ static int lm3554_probe(struct i2c_client *client)timer_setup (&flash->flash_off_delay, lm3554_flash_off_delay,0 ); - err =lm3554_gpio_init (client); -if (err) { + ret =lm3554_gpio_init (client); +if (ret) {dev_err (&client->dev,"gpio request/direction_output fail" ); - goto fail2; + goto err_del_timer; } -return atomisp_register_i2c_module (&flash->sd,NULL ,LED_FLASH ); -fail2: + + ret =atomisp_register_i2c_module (&flash->sd,NULL ,LED_FLASH ); +if (ret) + goto err_del_timer; + +return 0 ; + +err_del_timer: +del_timer_sync (&flash->flash_off_delay);media_entity_cleanup (&flash->sd.entity); +err_free_ctrl_handler:v4l2_ctrl_handler_free (&flash->ctrl_handler); -fail1: +err_unregister_sd:v4l2_device_unregister_subdev (&flash->sd); +err_free_flash:kfree (flash); - -return err; +return ret; }static int lm3554_remove (struct i2c_client *client)
Signature · 1 line
2.28.0
PATCH 2/3 staging: media: atomisp: Remove unhelpful info message
In reply to Alex DewarWe don't really need to know that the LED pin reset successfully.
--- drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/media/atomisp/i2c/atomisp-lm3554.c +0 -1
@@ -771,7 +771,6 @@ static int lm3554_gpio_init(struct i2c_client *client) ret =gpiod_direction_output (pdata->gpio_reset,0 );if (ret <0 )return ret; -dev_info (&client->dev,"flash led reset successfully\n" );if (!pdata->gpio_strobe)return -EINVAL ;
Signature · 1 line
2.28.0
PATCH 3/3 staging: media: atomisp: Don't abort on error in module exit path
In reply to Alex DewarThe function lm3554_remove() checks for the return code for lm3554_gpio_uninit() even though this is on the exit path and exits the function, leaving the variable flash unfreed. Instead, print a warning and free flash unconditionally.
--- .../staging/media/atomisp/i2c/atomisp-lm3554.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-lm3554.c +6 -12
@@ -782,7 +782,7 @@ static int lm3554_gpio_init(struct i2c_client *client)return 0 ; } -static int lm3554_gpio_uninit (struct i2c_client *client) +static void lm3554_gpio_uninit (struct i2c_client *client) {struct v4l2_subdev *sd =i2c_get_clientdata (client);struct lm3554 *flash =to_lm3554 (sd);
@@ -791,13 +791,13 @@ static int lm3554_gpio_uninit(struct i2c_client *client) ret =gpiod_direction_output (pdata->gpio_strobe,0 );if (ret <0 ) -return ret; +dev_err (&client->dev, +"gpio request/direction_output fail for gpio_strobe" ); ret =gpiod_direction_output (pdata->gpio_reset,0 );if (ret <0 ) -return ret; - -return 0 ; +dev_err (&client->dev, +"gpio request/direction_output fail for gpio_reset" ); }static void *lm3554_platform_data_func (struct i2c_client *client)
@@ -909,7 +909,6 @@ static int lm3554_remove(struct i2c_client *client) {struct v4l2_subdev *sd =i2c_get_clientdata (client);struct lm3554 *flash =to_lm3554 (sd); -int ret;media_entity_cleanup (&flash->sd.entity);v4l2_ctrl_handler_free (&flash->ctrl_handler);
@@ -919,16 +918,11 @@ static int lm3554_remove(struct i2c_client *client)del_timer_sync (&flash->flash_off_delay); - ret =lm3554_gpio_uninit (client); -if (ret <0 ) - goto fail; +lm3554_gpio_uninit (client);kfree (flash);return 0 ; -fail: -dev_err (&client->dev,"gpio request/direction_output fail" ); -return ret; }static const struct dev_pm_ops lm3554_pm_ops = {
Signature · 1 line
2.28.0