lkml.org 
[lkml]   [2013]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 020/104] usb: ehci-mxc: check for pdata before dereferencing
    Date
    3.5.7.22 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Daniel Mack <zonque@gmail.com>

    commit f375fc520d4df0cd9fcb570f33c103c6c0311f9e upstream.

    Commit 7e8d5cd93fac ("USB: Add EHCI support for MX27 and MX31 based
    boards") introduced code that could potentially lead to a NULL pointer
    dereference on driver removal.

    Fix this by checking for the value of pdata before dereferencing it.

    Signed-off-by: Daniel Mack <zonque@gmail.com>
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [ luis: backported to 3.5: adjusted context ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/usb/host/ehci-mxc.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
    index c778ffe..7bce025 100644
    --- a/drivers/usb/host/ehci-mxc.c
    +++ b/drivers/usb/host/ehci-mxc.c
    @@ -291,7 +291,7 @@ static int __exit ehci_mxc_drv_remove(struct platform_device *pdev)
    if (pdata && pdata->exit)
    pdata->exit(pdev);

    - if (pdata->otg)
    + if (pdata && pdata->otg)
    usb_phy_shutdown(pdata->otg);

    usb_remove_hcd(hcd);
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-09-30 13:21    [W:4.158 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site