Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73d79aab authored by Jesper Juhl's avatar Jesper Juhl Committed by Greg Kroah-Hartman
Browse files

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: default avatarJesper Juhl <jesper.juhl@gmail.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 148d9fe4

drivers/usb/gadget/amd5536udc.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -3248,6 +3248,8 @@ static int udc_pci_probe( 




	/* pci setup */

	/* pci setup */

	if (pci_enable_device(pdev) < 0) {

	if (pci_enable_device(pdev) < 0) {

		kfree(dev);

		dev = 0;

		retval = -ENODEV;

		retval = -ENODEV;

		goto finished;

		goto finished;

	}

	}
@@ -3259,6 +3261,8 @@ static int udc_pci_probe( 




	if (!request_mem_region(resource, len, name)) {

	if (!request_mem_region(resource, len, name)) {

		dev_dbg(&pdev->dev, "pci device used already\n");

		dev_dbg(&pdev->dev, "pci device used already\n");

		kfree(dev);

		dev = 0;

		retval = -EBUSY;

		retval = -EBUSY;

		goto finished;

		goto finished;

	}

	}
@@ -3267,18 +3271,24 @@ static int udc_pci_probe( 
	dev->virt_addr = ioremap_nocache(resource, len);

	dev->virt_addr = ioremap_nocache(resource, len);

	if (dev->virt_addr == NULL) {

	if (dev->virt_addr == NULL) {

		dev_dbg(&pdev->dev, "start address cannot be mapped\n");

		dev_dbg(&pdev->dev, "start address cannot be mapped\n");

		kfree(dev);

		dev = 0;

		retval = -EFAULT;

		retval = -EFAULT;

		goto finished;

		goto finished;

	}

	}





	if (!pdev->irq) {

	if (!pdev->irq) {

		dev_err(&dev->pdev->dev, "irq not set\n");

		dev_err(&dev->pdev->dev, "irq not set\n");

		kfree(dev);

		dev = 0;

		retval = -ENODEV;

		retval = -ENODEV;

		goto finished;

		goto finished;

	}

	}





	if (request_irq(pdev->irq, udc_irq, IRQF_SHARED, name, dev) != 0) {

	if (request_irq(pdev->irq, udc_irq, IRQF_SHARED, name, dev) != 0) {

		dev_dbg(&dev->pdev->dev, "request_irq(%d) fail\n", pdev->irq);

		dev_dbg(&dev->pdev->dev, "request_irq(%d) fail\n", pdev->irq);

		kfree(dev);

		dev = 0;

		retval = -EBUSY;

		retval = -EBUSY;

		goto finished;

		goto finished;

	}

	}