]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: chipidea: ci_hdrc_imx: fix usbmisc handling
authorFedor Pchelkin <pchelkin@ispras.ru>
Sun, 16 Mar 2025 10:26:54 +0000 (13:26 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Apr 2025 14:20:43 +0000 (16:20 +0200)
usbmisc is an optional device property so it is totally valid for the
corresponding data->usbmisc_data to have a NULL value.

Check that before dereferencing the pointer.

Found by Linux Verification Center (linuxtesting.org) with Svace static
analysis tool.

Fixes: 74adad500346 ("usb: chipidea: ci_hdrc_imx: decrement device's refcount in .remove() and in the error path of .probe()")
Cc: stable <stable@kernel.org>
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
Acked-by: Peter Chen <peter.chen@kernel.org>
Link: https://lore.kernel.org/r/20250316102658.490340-2-pchelkin@ispras.ru
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/chipidea/ci_hdrc_imx.c

index 1a7fc638213eba8a919b657d6af7ff5d236940c5..619779eef333446d196e5f3b70b976dd06e6afff 100644 (file)
@@ -534,7 +534,8 @@ disable_hsic_regulator:
                cpu_latency_qos_remove_request(&data->pm_qos_req);
        data->ci_pdev = NULL;
 err_put:
-       put_device(data->usbmisc_data->dev);
+       if (data->usbmisc_data)
+               put_device(data->usbmisc_data->dev);
        return ret;
 }
 
@@ -559,7 +560,8 @@ static void ci_hdrc_imx_remove(struct platform_device *pdev)
                if (data->hsic_pad_regulator)
                        regulator_disable(data->hsic_pad_regulator);
        }
-       put_device(data->usbmisc_data->dev);
+       if (data->usbmisc_data)
+               put_device(data->usbmisc_data->dev);
 }
 
 static void ci_hdrc_imx_shutdown(struct platform_device *pdev)