]> 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, 2 May 2025 05:50:50 +0000 (07:50 +0200)
commit 4e28f79e3dffa52d327b46d1a78dac16efb5810b upstream.

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 b3cbca361a969675ceef5ae9f4b8be263583a709..1a050bdf7bdbc6832a2b61b221a490b414c004b6 100644 (file)
@@ -520,7 +520,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;
 }
 
@@ -544,7 +545,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)