usb: gadget: tegra-xudc: Fix crash in vbus_draw
authorJon Hunter <jonathanh@nvidia.com>
Wed, 5 Apr 2023 18:18:53 +0000 (19:18 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 May 2023 14:03:30 +0000 (23:03 +0900)
[ Upstream commit 5629d31955297ca47b9283c64fff70f2f34aa528 ]

Commit ac82b56bda5f ("usb: gadget: tegra-xudc: Add vbus_draw support")
populated the vbus_draw callback for the Tegra XUDC driver. The function
tegra_xudc_gadget_vbus_draw(), that was added by this commit, assumes
that the pointer 'curr_usbphy' has been initialised, which is not always
the case because this is only initialised when the USB role is updated.
Fix this crash, by checking that the 'curr_usbphy' is valid before
dereferencing.

Fixes: ac82b56bda5f ("usb: gadget: tegra-xudc: Add vbus_draw support")
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/20230405181854.42355-1-jonathanh@nvidia.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/usb/gadget/udc/tegra-xudc.c

index 76919d7570d238f81d80064950131237655fc850..3c7ffb35c35cdae1d24c6b951fd176d4cd313709 100644 (file)
@@ -2160,7 +2160,7 @@ static int tegra_xudc_gadget_vbus_draw(struct usb_gadget *gadget,
 
        dev_dbg(xudc->dev, "%s: %u mA\n", __func__, m_a);
 
-       if (xudc->curr_usbphy->chg_type == SDP_TYPE)
+       if (xudc->curr_usbphy && xudc->curr_usbphy->chg_type == SDP_TYPE)
                ret = usb_phy_set_power(xudc->curr_usbphy, m_a);
 
        return ret;