lkml.org 
[lkml]   [2019]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 069/101] usb: usb251xb: fix to avoid potential NULL pointer dereference
    Date
    [ Upstream commit 41f00e6e9e55546390031996b773e7f3c1d95928 ]

    of_match_device in usb251xb_probe can fail and returns a NULL pointer.
    The patch avoids a potential NULL pointer dereference in this scenario.

    Signed-off-by: Aditya Pakki <pakki001@umn.edu>
    Reviewed-by: Richard Leitner <richard.leitner@skidata.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
    ---
    drivers/usb/misc/usb251xb.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
    index a6efb9a72939..5f7734c729b1 100644
    --- a/drivers/usb/misc/usb251xb.c
    +++ b/drivers/usb/misc/usb251xb.c
    @@ -601,7 +601,7 @@ static int usb251xb_probe(struct usb251xb *hub)
    dev);
    int err;

    - if (np) {
    + if (np && of_id) {
    err = usb251xb_get_ofdata(hub,
    (struct usb251xb_data *)of_id->data);
    if (err) {
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-05-02 17:35    [W:4.065 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site