lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 048/241] zd1211rw: fix NULL-deref at probe
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Johan Hovold <johan@kernel.org>


    [ Upstream commit ca260ece6a57dc7d751e0685f51fa2c55d851873 ]

    Make sure to check the number of endpoints to avoid dereferencing a
    NULL-pointer or accessing memory beyond the endpoint array should a
    malicious device lack the expected endpoints.

    Fixes: a1030e92c150 ("[PATCH] zd1211rw: Convert installer CDROM device into WLAN device")
    Cc: Daniel Drake <dsd@gentoo.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c
    +++ b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c
    @@ -1278,6 +1278,9 @@ static int eject_installer(struct usb_in
    u8 bulk_out_ep;
    int r;

    + if (iface_desc->desc.bNumEndpoints < 2)
    + return -ENODEV;
    +
    /* Find bulk out endpoint */
    for (r = 1; r >= 0; r--) {
    endpoint = &iface_desc->endpoint[r].desc;

    \
     
     \ /
      Last update: 2018-03-19 20:49    [W:4.057 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site