* [PATCH] media: media/pci: prevent memory leak in bttv_probe
@ 2020-03-25 9:01 Xiaolong Huang
2020-04-17 7:26 ` Hans Verkuil
0 siblings, 1 reply; 4+ messages in thread
From: Xiaolong Huang @ 2020-03-25 9:01 UTC (permalink / raw)
To: mchehab, hverkuil-cisco, tglx, mpe, allison
Cc: linux-media, linux-kernel, Xiaolong Huang
In bttv_probe if some functions such as pci_enable_device,
pci_set_dma_mask and request_mem_region fails the allocated
memory for btv should be released.
Signed-off-by: Xiaolong Huang <butterflyhuangxx@gmail.com>
---
drivers/media/pci/bt8xx/bttv-driver.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index a359da7773a9..37ac59110383 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -4013,10 +4013,14 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
btv->id = dev->device;
if (pci_enable_device(dev)) {
pr_warn("%d: Can't enable device\n", btv->c.nr);
+ bttvs[btv->c.nr] = NULL;
+ kfree(btv);
return -EIO;
}
if (pci_set_dma_mask(dev, DMA_BIT_MASK(32))) {
pr_warn("%d: No suitable DMA available\n", btv->c.nr);
+ bttvs[btv->c.nr] = NULL;
+ kfree(btv);
return -EIO;
}
if (!request_mem_region(pci_resource_start(dev,0),
@@ -4025,6 +4029,8 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
pr_warn("%d: can't request iomem (0x%llx)\n",
btv->c.nr,
(unsigned long long)pci_resource_start(dev, 0));
+ bttvs[btv->c.nr] = NULL;
+ kfree(btv);
return -EBUSY;
}
pci_set_master(dev);
@@ -4211,6 +4217,8 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
release_mem_region(pci_resource_start(btv->c.pci,0),
pci_resource_len(btv->c.pci,0));
pci_disable_device(btv->c.pci);
+ bttvs[btv->c.nr] = NULL;
+ kfree(btv);
return result;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] media: media/pci: prevent memory leak in bttv_probe
2020-03-25 9:01 [PATCH] media: media/pci: prevent memory leak in bttv_probe Xiaolong Huang
@ 2020-04-17 7:26 ` Hans Verkuil
2020-04-17 9:45 ` butt3rflyh4ck
0 siblings, 1 reply; 4+ messages in thread
From: Hans Verkuil @ 2020-04-17 7:26 UTC (permalink / raw)
To: Xiaolong Huang, mchehab, tglx, mpe, allison; +Cc: linux-media, linux-kernel
On 25/03/2020 10:01, Xiaolong Huang wrote:
> In bttv_probe if some functions such as pci_enable_device,
> pci_set_dma_mask and request_mem_region fails the allocated
> memory for btv should be released.
>
> Signed-off-by: Xiaolong Huang <butterflyhuangxx@gmail.com>
> ---
> drivers/media/pci/bt8xx/bttv-driver.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
> index a359da7773a9..37ac59110383 100644
> --- a/drivers/media/pci/bt8xx/bttv-driver.c
> +++ b/drivers/media/pci/bt8xx/bttv-driver.c
> @@ -4013,10 +4013,14 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
> btv->id = dev->device;
> if (pci_enable_device(dev)) {
> pr_warn("%d: Can't enable device\n", btv->c.nr);
> + bttvs[btv->c.nr] = NULL;
> + kfree(btv);
> return -EIO;
Let's change this...
> }
> if (pci_set_dma_mask(dev, DMA_BIT_MASK(32))) {
> pr_warn("%d: No suitable DMA available\n", btv->c.nr);
> + bttvs[btv->c.nr] = NULL;
> + kfree(btv);
> return -EIO;
this...
> }
> if (!request_mem_region(pci_resource_start(dev,0),
> @@ -4025,6 +4029,8 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
> pr_warn("%d: can't request iomem (0x%llx)\n",
> btv->c.nr,
> (unsigned long long)pci_resource_start(dev, 0));
> + bttvs[btv->c.nr] = NULL;
> + kfree(btv);
> return -EBUSY;
and this to a goto free_mem.
> }
> pci_set_master(dev);
> @@ -4211,6 +4217,8 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
> release_mem_region(pci_resource_start(btv->c.pci,0),
> pci_resource_len(btv->c.pci,0));
> pci_disable_device(btv->c.pci);
And add the free_mem: label here.
> + bttvs[btv->c.nr] = NULL;
> + kfree(btv);
> return result;
> }
>
>
Regards,
Hans
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] media: media/pci: prevent memory leak in bttv_probe
2020-04-17 7:26 ` Hans Verkuil
@ 2020-04-17 9:45 ` butt3rflyh4ck
0 siblings, 0 replies; 4+ messages in thread
From: butt3rflyh4ck @ 2020-04-17 9:45 UTC (permalink / raw)
To: Hans Verkuil, mchehab, tglx, mpe, allison; +Cc: linux-media, linux-kernel
On Fri, Apr 17, 2020 at 3:26 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> On 25/03/2020 10:01, Xiaolong Huang wrote:
> > In bttv_probe if some functions such as pci_enable_device,
> > pci_set_dma_mask and request_mem_region fails the allocated
> > memory for btv should be released.
> >
> > Signed-off-by: Xiaolong Huang <butterflyhuangxx@gmail.com>
> > ---
> > drivers/media/pci/bt8xx/bttv-driver.c | 8 ++++++++
> > 1 file changed, 8 insertions(+)
> >
> > diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
> > index a359da7773a9..37ac59110383 100644
> > --- a/drivers/media/pci/bt8xx/bttv-driver.c
> > +++ b/drivers/media/pci/bt8xx/bttv-driver.c
> > @@ -4013,10 +4013,14 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
> > btv->id = dev->device;
> > if (pci_enable_device(dev)) {
> > pr_warn("%d: Can't enable device\n", btv->c.nr);
> > + bttvs[btv->c.nr] = NULL;
> > + kfree(btv);
> > return -EIO;
>
> Let's change this...
>
> > }
> > if (pci_set_dma_mask(dev, DMA_BIT_MASK(32))) {
> > pr_warn("%d: No suitable DMA available\n", btv->c.nr);
> > + bttvs[btv->c.nr] = NULL;
> > + kfree(btv);
> > return -EIO;
>
> this...
>
> > }
> > if (!request_mem_region(pci_resource_start(dev,0),
> > @@ -4025,6 +4029,8 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
> > pr_warn("%d: can't request iomem (0x%llx)\n",
> > btv->c.nr,
> > (unsigned long long)pci_resource_start(dev, 0));
> > + bttvs[btv->c.nr] = NULL;
> > + kfree(btv);
> > return -EBUSY;
>
> and this to a goto free_mem.
>
> > }
> > pci_set_master(dev);
> > @@ -4211,6 +4217,8 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
> > release_mem_region(pci_resource_start(btv->c.pci,0),
> > pci_resource_len(btv->c.pci,0));
> > pci_disable_device(btv->c.pci);
>
> And add the free_mem: label here.
>
> > + bttvs[btv->c.nr] = NULL;
> > + kfree(btv);
> > return result;
> > }
> >
> >
>
> Regards,
>
> Hans
Good, I will modify the patch and resend a new one.
Thanks,
Butt3flyh4ck
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] media: media/pci: prevent memory leak in bttv_probe
@ 2020-04-17 9:52 Xiaolong Huang
0 siblings, 0 replies; 4+ messages in thread
From: Xiaolong Huang @ 2020-04-17 9:52 UTC (permalink / raw)
To: mchehab, hverkuil-cisco, tglx, mpe, allison
Cc: linux-media, linux-kernel, Xiaolong Huang
In bttv_probe if some functions such as pci_enable_device,
pci_set_dma_mask and request_mem_region fails the allocated
memory for btv should be released.
Signed-off-by: Xiaolong Huang <butterflyhuangxx@gmail.com>
---
drivers/media/pci/bt8xx/bttv-driver.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 9144f795fb93..b721720f9845 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -4013,11 +4013,13 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
btv->id = dev->device;
if (pci_enable_device(dev)) {
pr_warn("%d: Can't enable device\n", btv->c.nr);
- return -EIO;
+ result = -EIO;
+ goto free_mem;
}
if (pci_set_dma_mask(dev, DMA_BIT_MASK(32))) {
pr_warn("%d: No suitable DMA available\n", btv->c.nr);
- return -EIO;
+ result = -EIO;
+ goto free_mem;
}
if (!request_mem_region(pci_resource_start(dev,0),
pci_resource_len(dev,0),
@@ -4025,7 +4027,8 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
pr_warn("%d: can't request iomem (0x%llx)\n",
btv->c.nr,
(unsigned long long)pci_resource_start(dev, 0));
- return -EBUSY;
+ result = -EBUSY;
+ goto free_mem;
}
pci_set_master(dev);
pci_set_command(dev);
@@ -4211,6 +4214,10 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
release_mem_region(pci_resource_start(btv->c.pci,0),
pci_resource_len(btv->c.pci,0));
pci_disable_device(btv->c.pci);
+
+free_mem:
+ bttvs[btv->c.nr] = NULL;
+ kfree(btv);
return result;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-17 9:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-25 9:01 [PATCH] media: media/pci: prevent memory leak in bttv_probe Xiaolong Huang
2020-04-17 7:26 ` Hans Verkuil
2020-04-17 9:45 ` butt3rflyh4ck
2020-04-17 9:52 Xiaolong Huang
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).