forked from luck/tmp_suning_uos_patched
USB: mem leak fixes for AMD 5536 UDC high/full speed USB device controller driver
In drivers/usb/gadget/amd5536udc.c::udc_pci_probe(), sizeof(struct udc) storage is allocated for 'dev'. There are many exit points from the function where 'dev' is not free'd but has also not yet been used for anything. The following patch free's 'dev' at the return points where it has not yet been used. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Cc: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
148d9fe4c9
commit
73d79aaba9
@ -3248,6 +3248,8 @@ static int udc_pci_probe(
|
||||
|
||||
/* pci setup */
|
||||
if (pci_enable_device(pdev) < 0) {
|
||||
kfree(dev);
|
||||
dev = 0;
|
||||
retval = -ENODEV;
|
||||
goto finished;
|
||||
}
|
||||
@ -3259,6 +3261,8 @@ static int udc_pci_probe(
|
||||
|
||||
if (!request_mem_region(resource, len, name)) {
|
||||
dev_dbg(&pdev->dev, "pci device used already\n");
|
||||
kfree(dev);
|
||||
dev = 0;
|
||||
retval = -EBUSY;
|
||||
goto finished;
|
||||
}
|
||||
@ -3267,18 +3271,24 @@ static int udc_pci_probe(
|
||||
dev->virt_addr = ioremap_nocache(resource, len);
|
||||
if (dev->virt_addr == NULL) {
|
||||
dev_dbg(&pdev->dev, "start address cannot be mapped\n");
|
||||
kfree(dev);
|
||||
dev = 0;
|
||||
retval = -EFAULT;
|
||||
goto finished;
|
||||
}
|
||||
|
||||
if (!pdev->irq) {
|
||||
dev_err(&dev->pdev->dev, "irq not set\n");
|
||||
kfree(dev);
|
||||
dev = 0;
|
||||
retval = -ENODEV;
|
||||
goto finished;
|
||||
}
|
||||
|
||||
if (request_irq(pdev->irq, udc_irq, IRQF_SHARED, name, dev) != 0) {
|
||||
dev_dbg(&dev->pdev->dev, "request_irq(%d) fail\n", pdev->irq);
|
||||
kfree(dev);
|
||||
dev = 0;
|
||||
retval = -EBUSY;
|
||||
goto finished;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user