lkml.org 
[lkml]   [2015]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 046/144] usb: phy: am335x-control: check return value of bus_find_device
    Date
    3.16.7-ckt10 -stable review patch.  If anyone has any objections, please let me know.

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

    From: David Dueck <davidcdueck@googlemail.com>

    commit d0f347d62814ec0f599a05c61c5619d5e999e4ae upstream.

    This fixes a potential null pointer dereference.

    Fixes: d4332013919a ("driver core: dev_get_drvdata: Don't check for NULL dev")
    Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    Signed-off-by: David Dueck <davidcdueck@googlemail.com>
    Signed-off-by: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/usb/phy/phy-am335x-control.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/usb/phy/phy-am335x-control.c b/drivers/usb/phy/phy-am335x-control.c
    index 35b6083b7999..d5eca7b9c555 100644
    --- a/drivers/usb/phy/phy-am335x-control.c
    +++ b/drivers/usb/phy/phy-am335x-control.c
    @@ -126,6 +126,9 @@ struct phy_control *am335x_get_phy_control(struct device *dev)
    return NULL;

    dev = bus_find_device(&platform_bus_type, NULL, node, match);
    + if (!dev)
    + return NULL;
    +
    ctrl_usb = dev_get_drvdata(dev);
    if (!ctrl_usb)
    return NULL;

    \
     
     \ /
      Last update: 2015-04-21 18:41    [W:5.694 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site