Commit 06a59afa authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20140613-1' into staging 



usb-host: add range checks for usb-host parameters

# gpg: Signature made Fri 13 Jun 2014 12:33:05 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-usb-20140613-1:
  usb-host: add range checks for usb-host parameters

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 80008a6a f3cda6e0

hw/usb/host-libusb.c

+13 −0
Original line number Diff line number Diff line
@@ -952,6 +952,19 @@ static int usb_host_initfn(USBDevice *udev) 
{

    USBHostDevice *s = USB_HOST_DEVICE(udev);



    if (s->match.vendor_id > 0xffff) {

        error_report("vendorid out of range");

        return -1;

    }

    if (s->match.product_id > 0xffff) {

        error_report("productid out of range");

        return -1;

    }

    if (s->match.addr > 127) {

        error_report("hostaddr out of range");

        return -1;

    }



    loglevel = s->loglevel;

    udev->flags |= (1 << USB_DEV_FLAG_IS_HOST);

    udev->auto_attach = 0;