lkml.org 
[lkml]   [2016]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 066/115] USB: digi_acceleport: do sanity checking for the number of ports
    3.2.80-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Oliver Neukum <oneukum@suse.com>

    commit 5a07975ad0a36708c6b0a5b9fea1ff811d0b0c1f upstream.

    The driver can be crashed with devices that expose crafted descriptors
    with too few endpoints.

    See: http://seclists.org/bugtraq/2016/Mar/61

    Signed-off-by: Oliver Neukum <ONeukum@suse.com>
    [johan: fix OOB endpoint check and add error messages ]
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [bwh: Backported to 3.2: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    --- a/drivers/usb/serial/digi_acceleport.c
    +++ b/drivers/usb/serial/digi_acceleport.c
    @@ -1489,12 +1489,30 @@ static int digi_startup_device(struct us
    static int digi_startup(struct usb_serial *serial)
    {

    + struct device *dev = &serial->interface->dev;
    int i;
    struct digi_port *priv;
    struct digi_serial *serial_priv;

    dbg("digi_startup: TOP");

    + /* check whether the device has the expected number of endpoints */
    + if (serial->num_port_pointers < serial->type->num_ports + 1) {
    + dev_err(dev, "OOB endpoints missing\n");
    + return -ENODEV;
    + }
    +
    + for (i = 0; i < serial->type->num_ports + 1 ; i++) {
    + if (!serial->port[i]->read_urb) {
    + dev_err(dev, "bulk-in endpoint missing\n");
    + return -ENODEV;
    + }
    + if (!serial->port[i]->write_urb) {
    + dev_err(dev, "bulk-out endpoint missing\n");
    + return -ENODEV;
    + }
    + }
    +
    /* allocate the private data structures for all ports */
    /* number of regular ports + 1 for the out-of-band port */
    for (i = 0; i < serial->type->num_ports + 1; i++) {
    \
     
     \ /
      Last update: 2016-04-27 01:41    [W:5.223 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site