lkml.org 
[lkml]   [2020]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 050/151] usb: gadget: goku_udc: fix potential crashes in probe
    Date
    From: Evgeny Novikov <novikov@ispras.ru>

    [ Upstream commit 0d66e04875c5aae876cf3d4f4be7978fa2b00523 ]

    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: Pavel Andrianov <andrianov@ispras.ru>
    Signed-off-by: Evgeny Novikov <novikov@ispras.ru>
    Signed-off-by: Felipe Balbi <balbi@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/gadget/udc/goku_udc.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/usb/gadget/udc/goku_udc.c b/drivers/usb/gadget/udc/goku_udc.c
    index c3721225b61ed..b706ad3034bc1 100644
    --- a/drivers/usb/gadget/udc/goku_udc.c
    +++ b/drivers/usb/gadget/udc/goku_udc.c
    @@ -1757,6 +1757,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;
    @@ -1790,7 +1791,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);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-17 14:39    [W:4.121 / U:0.972 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site