From: Dan Carpenter <dan.carpenter@oracle.com>
To: Alex Dewar <alex.dewar90@gmail.com>
Cc: devel@driverdev.osuosl.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linus Walleij <linus.walleij@linaro.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Alan Cox <alan@linux.intel.com>
Subject: Re: [PATCH] staging: media: atomisp: Fix error path in lm3554_probe()
Date: Thu, 3 Sep 2020 15:11:34 +0300 [thread overview]
Message-ID: <20200903121134.GB8299@kadam> (raw)
In-Reply-To: <20200902184207.479525-1-alex.dewar90@gmail.com>
On Wed, Sep 02, 2020 at 07:41:50PM +0100, Alex Dewar wrote:
> 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"").
>
Almost perfect! Just a couple other leaks we should fix as well.
> + 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,22 @@ static int lm3554_probe(struct i2c_client *client)
>
> timer_setup(&flash->flash_off_delay, lm3554_flash_off_delay, 0);
We need to delete this timer.
>
> - 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_cleanup_entity;
> }
> return atomisp_register_i2c_module(&flash->sd, NULL, LED_FLASH);
If atomisp_register_i2c_module() fails then we need to call
lm3554_gpio_uninit(client) and do other cleanup.
> -fail2:
> +
> +err_cleanup_entity:
> media_entity_cleanup(&flash->sd.entity);
> +err_free_ctrl_handler:
> v4l2_ctrl_handler_free(&flash->ctrl_handler);
regards,
dan carpenter
next prev parent reply other threads:[~2020-09-03 12:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 18:41 [PATCH] staging: media: atomisp: Fix error path in lm3554_probe() Alex Dewar
2020-09-03 12:11 ` Dan Carpenter [this message]
2020-09-03 15:48 ` Alex Dewar
2020-09-03 17:38 ` Dan Carpenter
2020-09-03 18:21 ` Alex Dewar
2020-09-03 18:24 ` [PATCH v2] " Alex Dewar
2020-09-04 6:35 ` Dan Carpenter
2020-09-19 19:50 ` Alex Dewar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200903121134.GB8299@kadam \
--to=dan.carpenter@oracle.com \
--cc=alan@linux.intel.com \
--cc=alex.dewar90@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).