lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.14 217/252] usb: musb: musb_dsps: request_irq() after initializing musb
    Date
    From: Nadezda Lutovinova <lutovinova@ispras.ru>

    [ Upstream commit 7c75bde329d7e2a93cf86a5c15c61f96f1446cdc ]

    If IRQ occurs between calling dsps_setup_optional_vbus_irq()
    and dsps_create_musb_pdev(), then null pointer dereference occurs
    since glue->musb wasn't initialized yet.

    The patch puts initializing of neccesery data before registration
    of the interrupt handler.

    Found by Linux Driver Verification project (linuxtesting.org).

    Signed-off-by: Nadezda Lutovinova <lutovinova@ispras.ru>
    Link: https://lore.kernel.org/r/20210819163323.17714-1-lutovinova@ispras.ru
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/musb/musb_dsps.c | 13 ++++++-------
    1 file changed, 6 insertions(+), 7 deletions(-)

    diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
    index 5892f3ce0cdc..ce9fc46c9266 100644
    --- a/drivers/usb/musb/musb_dsps.c
    +++ b/drivers/usb/musb/musb_dsps.c
    @@ -890,23 +890,22 @@ static int dsps_probe(struct platform_device *pdev)
    if (!glue->usbss_base)
    return -ENXIO;

    - if (usb_get_dr_mode(&pdev->dev) == USB_DR_MODE_PERIPHERAL) {
    - ret = dsps_setup_optional_vbus_irq(pdev, glue);
    - if (ret)
    - goto err_iounmap;
    - }
    -
    platform_set_drvdata(pdev, glue);
    pm_runtime_enable(&pdev->dev);
    ret = dsps_create_musb_pdev(glue, pdev);
    if (ret)
    goto err;

    + if (usb_get_dr_mode(&pdev->dev) == USB_DR_MODE_PERIPHERAL) {
    + ret = dsps_setup_optional_vbus_irq(pdev, glue);
    + if (ret)
    + goto err;
    + }
    +
    return 0;

    err:
    pm_runtime_disable(&pdev->dev);
    -err_iounmap:
    iounmap(glue->usbss_base);
    return ret;
    }
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 14:07    [W:3.568 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site