소스 검색

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>
Jesper Juhl 17 년 전
부모
커밋
73d79aaba9
1개의 변경된 파일10개의 추가작업 그리고 0개의 파일을 삭제
  1. 10 0
      drivers/usb/gadget/amd5536udc.c

+ 10 - 0
drivers/usb/gadget/amd5536udc.c

@@ -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;
 	}
 	}