All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
To: Anton Vasilyev <vasilyev@ispras.ru>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
	linux-media <linux-media@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	ldv-project@linuxtesting.org
Subject: Re: [PATCH] media: davinci: vpif_display: Mix memory leak on probe error path
Date: Thu, 2 Aug 2018 10:51:51 +0100	[thread overview]
Message-ID: <CA+V-a8vXEiZ6widPZRdiw-0QejFHwDcTtMz5iKfkHc9gZLZ79Q@mail.gmail.com> (raw)
In-Reply-To: <20180727115220.10991-1-vasilyev@ispras.ru>

Hi,

thank you for the patch.

On Fri, Jul 27, 2018 at 12:52 PM, Anton Vasilyev <vasilyev@ispras.ru> wrote:
> If vpif_probe() fails on v4l2_device_register() 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 and
> removes duplicated check on platform_data presence.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Anton Vasilyev <vasilyev@ispras.ru>
> ---
>  drivers/media/platform/davinci/vpif_display.c | 24 ++++++++++++-------
>  1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
> index 7be636237acf..0f324055cc9f 100644
> --- a/drivers/media/platform/davinci/vpif_display.c
> +++ b/drivers/media/platform/davinci/vpif_display.c
> @@ -1114,6 +1114,14 @@ static int initialize_vpif(void)
>         return err;
>  }
>
> +static void free_vpif_objs(void)
> +{
> +       int i;
> +
> +       for (i = 0; i < VPIF_DISPLAY_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)
> @@ -1255,11 +1263,6 @@ static __init int vpif_probe(struct platform_device *pdev)
>                 return -EINVAL;
>         }
>
> -       if (!pdev->dev.platform_data) {
> -               dev_warn(&pdev->dev, "Missing platform data.  Giving up.\n");
> -               return -EINVAL;
> -       }
> -
Could make this as a separate patch.

>         vpif_dev = &pdev->dev;
>         err = initialize_vpif();
>
> @@ -1271,7 +1274,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");
> -               return err;
> +               goto vpif_free;
>         }
>
>         while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) {
> @@ -1314,7 +1317,10 @@ static __init int vpif_probe(struct platform_device *pdev)
>                         if (vpif_obj.sd[i])
>                                 vpif_obj.sd[i]->grp_id = 1 << i;
>                 }
> -               vpif_probe_complete();
> +               err = vpif_probe_complete();
> +               if (err) {
> +                       goto probe_subdev_out;
> +               }

{} braces are not needed

>         } else {
>                 vpif_obj.notifier.subdevs = vpif_obj.config->asd;
>                 vpif_obj.notifier.num_subdevs = vpif_obj.config->asd_sizes[0];
> @@ -1334,6 +1340,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();
>
Just put the for loop here instead.

>         return err;
>  }
> @@ -1355,8 +1363,8 @@ static int vpif_remove(struct platform_device *device)
>                 ch = vpif_obj.dev[i];
>                 /* Unregister video device */
>                 video_unregister_device(&ch->video_dev);
> -               kfree(vpif_obj.dev[i]);
>         }
> +       free_vpif_objs();
>
Just leave this as is, as its already looping and freeing up the objects.

>         return 0;
>  }
> --
> 2.18.0
>

Cheers,
--Prabhakar Lad

  reply	other threads:[~2018-08-02  9:52 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-27 11:52 [PATCH] media: davinci: vpif_display: Mix memory leak on probe error path Anton Vasilyev
2018-08-02  9:51 ` Lad, Prabhakar [this message]
2018-08-06 15:50   ` [PATCH v2 1/2] " Anton Vasilyev
2018-08-06 15:50     ` [PATCH v2 2/2] media: davinci: vpif_display: remove duplicate check Anton Vasilyev
2018-08-13 11:46       ` Lad, Prabhakar
2018-08-13 11:47     ` [PATCH v2 1/2] media: davinci: vpif_display: Mix memory leak on probe error path Lad, Prabhakar

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-a8vXEiZ6widPZRdiw-0QejFHwDcTtMz5iKfkHc9gZLZ79Q@mail.gmail.com \
    --to=prabhakar.csengg@gmail.com \
    --cc=ldv-project@linuxtesting.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=vasilyev@ispras.ru \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.