]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
usb: gadget: r8a66597: Add missing null check on return from platform_get_resource
authorColin Ian King <colin.king@canonical.com>
Tue, 6 Apr 2021 18:45:10 +0000 (19:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 07:44:21 +0000 (09:44 +0200)
[ Upstream commit 9c2076090c2815fe7c49676df68dde7e60a9b9fc ]

The call to platform_get_resource can potentially return a NULL pointer
on failure, so add this check and return -EINVAL if it fails.

Fixes: c41442474a26 ("usb: gadget: R8A66597 peripheral controller support.")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Addresses-Coverity: ("Dereference null return")
Link: https://lore.kernel.org/r/20210406184510.433497-1-colin.king@canonical.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/usb/gadget/udc/r8a66597-udc.c

index 11e25a3f4f1fa86ea42677d7efbbdd1f0f83e6b5..a766476fd742e23a1d59009f0a0c6e6ccd220ef7 100644 (file)
@@ -1852,6 +1852,8 @@ static int r8a66597_probe(struct platform_device *pdev)
                return PTR_ERR(reg);
 
        ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+       if (!ires)
+               return -EINVAL;
        irq = ires->start;
        irq_trigger = ires->flags & IRQF_TRIGGER_MASK;