Commit 4d819a9b authored by Hans de Goede's avatar Hans de Goede Committed by Gerd Hoffmann
Browse files

usb: return BABBLE rather then NAK when we receive too much data 



Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 5eafd438

usb-linux.c

+7 −1
Original line number Diff line number Diff line
@@ -364,6 +364,10 @@ static void async_complete(void *opaque) 
                p->result = USB_RET_STALL;

                break;



            case -EOVERFLOW:

                p->result = USB_RET_BABBLE;

                break;



            default:

                p->result = USB_RET_NAK;

                break;
@@ -722,6 +726,8 @@ static int urb_status_to_usb_ret(int status) 
    switch (status) {

    case -EPIPE:

        return USB_RET_STALL;

    case -EOVERFLOW:

        return USB_RET_BABBLE;

    default:

        return USB_RET_NAK;

    }
@@ -759,7 +765,7 @@ static int usb_host_handle_iso_data(USBHostDevice *s, USBPacket *p, int in) 
            } else if (aurb[i].urb.iso_frame_desc[j].actual_length

                       > p->iov.size) {

                printf("husb: received iso data is larger then packet\n");

                len = USB_RET_NAK;

                len = USB_RET_BABBLE;

            /* All good copy data over */

            } else {

                len = aurb[i].urb.iso_frame_desc[j].actual_length;

usb-redir.c

+2 −2
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static int usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p, 
            ERROR("received iso data is larger then packet ep %02X (%d > %d)\n",

                  ep, len, (int)p->iov.size);

            bufp_free(dev, isop, ep);

            return USB_RET_NAK;

            return USB_RET_BABBLE;

        }

        usb_packet_copy(p, isop->data, len);

        bufp_free(dev, isop, ep);
@@ -566,7 +566,7 @@ static int usbredir_handle_interrupt_data(USBRedirDevice *dev, 
        if (len > p->iov.size) {

            ERROR("received int data is larger then packet ep %02X\n", ep);

            bufp_free(dev, intp, ep);

            return USB_RET_NAK;

            return USB_RET_BABBLE;

        }

        usb_packet_copy(p, intp->data, len);

        bufp_free(dev, intp, ep);