lkml.org 
[lkml]   [2018]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 15/45] usbip: fix stub_rx: get_pipe() to validate endpoint number
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Shuah Khan <shuahkh@osg.samsung.com>

    commit 635f545a7e8be7596b9b2b6a43cab6bbd5a88e43 upstream.

    get_pipe() routine doesn't validate the input endpoint number
    and uses to reference ep_in and ep_out arrays. Invalid endpoint
    number can trigger BUG(). Range check the epnum and returning
    error instead of calling BUG().

    Change caller stub_recv_cmd_submit() to handle the get_pipe()
    error return.

    Reported-by: Secunia Research <vuln@secunia.com>
    Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


    ---
    drivers/usb/usbip/stub_rx.c | 16 ++++++++++------
    1 file changed, 10 insertions(+), 6 deletions(-)

    --- a/drivers/usb/usbip/stub_rx.c
    +++ b/drivers/usb/usbip/stub_rx.c
    @@ -347,15 +347,15 @@ static int get_pipe(struct stub_device *
    struct usb_host_endpoint *ep;
    struct usb_endpoint_descriptor *epd = NULL;

    + if (epnum < 0 || epnum > 15)
    + goto err_ret;
    +
    if (dir == USBIP_DIR_IN)
    ep = udev->ep_in[epnum & 0x7f];
    else
    ep = udev->ep_out[epnum & 0x7f];
    - if (!ep) {
    - dev_err(&sdev->interface->dev, "no such endpoint?, %d\n",
    - epnum);
    - BUG();
    - }
    + if (!ep)
    + goto err_ret;

    epd = &ep->desc;
    if (usb_endpoint_xfer_control(epd)) {
    @@ -386,9 +386,10 @@ static int get_pipe(struct stub_device *
    return usb_rcvisocpipe(udev, epnum);
    }

    +err_ret:
    /* NOT REACHED */
    dev_err(&sdev->interface->dev, "get pipe, epnum %d\n", epnum);
    - return 0;
    + return -1;
    }

    static void masking_bogus_flags(struct urb *urb)
    @@ -454,6 +455,9 @@ static void stub_recv_cmd_submit(struct
    struct usb_device *udev = sdev->udev;
    int pipe = get_pipe(sdev, pdu->base.ep, pdu->base.direction);

    + if (pipe == -1)
    + return;
    +
    priv = stub_priv_alloc(sdev, pdu);
    if (!priv)
    return;

    \
     
     \ /
      Last update: 2018-02-15 19:57    [W:4.137 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site