public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: alexious@zju.edu.cn
To: "Hans Verkuil" <hverkuil-cisco@xs4all.nl>
Cc: "Mauro Carvalho Chehab" <mchehab@kernel.org>,
	"Yu Zhe" <yuzhe@nfschina.com>, "Jakub Kicinski" <kuba@kernel.org>,
	linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] media: ttpci: fix two memleaks in budget_av_attach
Date: Wed, 21 Feb 2024 13:07:06 +0800 (GMT+08:00)	[thread overview]
Message-ID: <77f4e75d.eff9.18dca0f7285.Coremail.alexious@zju.edu.cn> (raw)
In-Reply-To: <fb4f6b74-8af4-43c6-9119-0c3ec2a3387b@xs4all.nl>

> On 06/02/2024 08:37, Zhipeng Lu wrote:
> > When saa7146_register_device and saa7146_vv_init fails, budget_av_attach
> > should free the resources it allocates, like the error-handling of
> > ttpci_budget_init does. Besides, there are two fixme comment refers to
> > such deallocations.
> > 
> > Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> > Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
> > ---
> >  drivers/media/pci/ttpci/budget-av.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/media/pci/ttpci/budget-av.c b/drivers/media/pci/ttpci/budget-av.c
> > index 230b104a7cdf..4f897f848581 100644
> > --- a/drivers/media/pci/ttpci/budget-av.c
> > +++ b/drivers/media/pci/ttpci/budget-av.c
> > @@ -1463,7 +1463,8 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
> >  		budget_av->has_saa7113 = 1;
> >  		err = saa7146_vv_init(dev, &vv_data);
> >  		if (err != 0) {
> > -			/* fixme: proper cleanup here */
> > +			ttpci_budget_deinit(&budget_av->budget);
> > +			kfree(budget_av);
> >  			ERR("cannot init vv subsystem\n");
> >  			return err;
> >  		}
> > @@ -1472,7 +1473,8 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
> >  		vv_data.vid_ops.vidioc_s_input = vidioc_s_input;
> >  
> >  		if ((err = saa7146_register_device(&budget_av->vd, dev, "knc1", VFL_TYPE_VIDEO))) {
> > -			/* fixme: proper cleanup here */
> > +			ttpci_budget_deinit(&budget_av->budget);
> > +			kfree(budget_av);
> I think this should go after the saa7146_vv_release() release below.
> Just in case saa7146_vv_release() relies on budget_av somewhere. And
> besides, it is good practice to release resources in the reverse order
> they were allocated.

Yes, I noticed the order of `kfree(budget_av)` and `ttpci_budget_deinit`, 
but did forgot the `saa7146_vv_release`. I'll send a v2 version of this 
patch soon.

Regards,
Zhipeng

> 
> >  			ERR("cannot register capture v4l2 device\n");
> >  			saa7146_vv_release(dev);
> >  			return err;

      reply	other threads:[~2024-02-21  5:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-06  7:37 [PATCH] media: ttpci: fix two memleaks in budget_av_attach Zhipeng Lu
2024-02-14  9:27 ` Hans Verkuil
2024-02-21  5:07   ` alexious [this message]

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=77f4e75d.eff9.18dca0f7285.Coremail.alexious@zju.edu.cn \
    --to=alexious@zju.edu.cn \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=yuzhe@nfschina.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