usb: dwc3: Fix dereferencing of null dwc->usb_psy
authorColin Ian King <colin.king@canonical.com>
Wed, 3 Mar 2021 09:58:26 +0000 (09:58 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Mar 2021 08:37:16 +0000 (09:37 +0100)
Currently the null check logic on dwc->usb_psy is inverted as it allows
calls to power_supply_put with a null dwc->usb_psy causing a null
pointer dereference. Fix this by removing the ! operator.

Addresses-Coverity: ("Dereference after null check")
Fixes: 59fa3def35de ("usb: dwc3: add a power supply for current control")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20210303095826.6143-1-colin.king@canonical.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/core.c

index d15f065..94fdbe5 100644 (file)
@@ -1628,7 +1628,7 @@ disable_clks:
 assert_reset:
        reset_control_assert(dwc->reset);
 
-       if (!dwc->usb_psy)
+       if (dwc->usb_psy)
                power_supply_put(dwc->usb_psy);
 
        return ret;
@@ -1653,7 +1653,7 @@ static int dwc3_remove(struct platform_device *pdev)
        dwc3_free_event_buffers(dwc);
        dwc3_free_scratch_buffers(dwc);
 
-       if (!dwc->usb_psy)
+       if (dwc->usb_psy)
                power_supply_put(dwc->usb_psy);
 
        return 0;