From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
To: Young Xiao <92siuyang@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>,
linux-media <linux-media@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] media: davinci: vpif_capture: fix memory leak in vpif_probe()
Date: Wed, 5 Jun 2019 21:20:45 +0100 [thread overview]
Message-ID: <CA+V-a8t1cu1HVp5GMT1k2q9RaJfVcQij=ATHRFKAVGdyiiXTcw@mail.gmail.com> (raw)
In-Reply-To: <1559651193-17982-1-git-send-email-92siuyang@gmail.com>
On Tue, Jun 4, 2019 at 1:25 PM Young Xiao <92siuyang@gmail.com> wrote:
>
> If vpif_probe() fails on v4l2_device_register() and vpif_probe_complete(),
> then memory allocated at initialize_vpif() for global vpif_obj.dev[i]
> become unreleased.
>
> The patch adds deallocation of vpif_obj.dev[i] on the error path.
>
> Signed-off-by: Young Xiao <92siuyang@gmail.com>
> ---
> drivers/media/platform/davinci/vpif_capture.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Cheers,
--Prabhakar Lad
> diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
> index b5aacb0..75c2c10 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -1385,6 +1385,14 @@ static int initialize_vpif(void)
> return err;
> }
>
> +static inline void free_vpif_objs(void)
> +{
> + int i;
> +
> + for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++)
> + kfree(vpif_obj.dev[i]);
> +}
> +
> static int vpif_async_bound(struct v4l2_async_notifier *notifier,
> struct v4l2_subdev *subdev,
> struct v4l2_async_subdev *asd)
> @@ -1654,7 +1662,7 @@ static __init int vpif_probe(struct platform_device *pdev)
> err = v4l2_device_register(vpif_dev, &vpif_obj.v4l2_dev);
> if (err) {
> v4l2_err(vpif_dev->driver, "Error registering v4l2 device\n");
> - goto cleanup;
> + goto vpif_free;
> }
>
> while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) {
> @@ -1701,7 +1709,9 @@ static __init int vpif_probe(struct platform_device *pdev)
> "registered sub device %s\n",
> subdevdata->name);
> }
> - vpif_probe_complete();
> + err = vpif_probe_complete();
> + if (err)
> + goto probe_subdev_out;
> } else {
> vpif_obj.notifier.ops = &vpif_async_ops;
> err = v4l2_async_notifier_register(&vpif_obj.v4l2_dev,
> @@ -1720,6 +1730,8 @@ static __init int vpif_probe(struct platform_device *pdev)
> kfree(vpif_obj.sd);
> vpif_unregister:
> v4l2_device_unregister(&vpif_obj.v4l2_dev);
> +vpif_free:
> + free_vpif_objs();
> cleanup:
> v4l2_async_notifier_cleanup(&vpif_obj.notifier);
>
> --
> 2.7.4
>
next prev parent reply other threads:[~2019-06-05 20:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-04 12:26 [PATCH] media: davinci: vpif_capture: fix memory leak in vpif_probe() Young Xiao
2019-06-05 20:20 ` Lad, Prabhakar [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-06-04 7:50 Young Xiao
2019-06-04 8:15 ` Lad, Prabhakar
2019-06-04 8:33 ` Yang Xiao
2019-06-04 8:47 ` Lad, Prabhakar
2019-05-29 13:09 Young Xiao
2019-06-03 11:55 ` Hans Verkuil
2019-06-04 7:15 ` Yang Xiao
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='CA+V-a8t1cu1HVp5GMT1k2q9RaJfVcQij=ATHRFKAVGdyiiXTcw@mail.gmail.com' \
--to=prabhakar.csengg@gmail.com \
--cc=92siuyang@gmail.com \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/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).