lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 658/757] media: media/pci: prevent memory leak in bttv_probe
    Date
    From: Xiaolong Huang <butterflyhuangxx@gmail.com>

    [ Upstream commit 7b817585b730665126b45df5508dd69526448bc8 ]

    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>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 9144f795fb933..b721720f9845a 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.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:35    [W:4.504 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site