Commit 766d1dcd authored by Evgeny Novikov's avatar Evgeny Novikov Committed by Greg Kroah-Hartman
Browse files

usb: gadget: goku_udc: fix potential crashes in probe 



[ Upstream commit 0d66e048 ]

goku_probe() goes to error label "err" and invokes goku_remove()
in case of failures of pci_enable_device(), pci_resource_start()
and ioremap(). goku_remove() gets a device from
pci_get_drvdata(pdev) and works with it without any checks, in
particular it dereferences a corresponding pointer. But
goku_probe() did not set this device yet. So, one can expect
various crashes. The patch moves setting the device just after
allocation of memory for it.

Found by Linux Driver Verification project (linuxtesting.org).

Reported-by: default avatarPavel Andrianov <andrianov@ispras.ru>
Signed-off-by: default avatarEvgeny Novikov <novikov@ispras.ru>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8ec600ac

drivers/usb/gadget/udc/goku_udc.c

+1 −1
Original line number Diff line number Diff line
@@ -1760,6 +1760,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto err;

	}



	pci_set_drvdata(pdev, dev);

	spin_lock_init(&dev->lock);

	dev->pdev = pdev;

	dev->gadget.ops = &goku_ops;
@@ -1793,7 +1794,6 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	}

	dev->regs = (struct goku_udc_regs __iomem *) base;



	pci_set_drvdata(pdev, dev);

	INFO(dev, "%s\n", driver_desc);

	INFO(dev, "version: " DRIVER_VERSION " %s\n", dmastr());

	INFO(dev, "irq %d, pci mem %p\n", pdev->irq, base);