From 440a13d6561ed07027b21eebf0050201055d7961 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 10 Jan 2012 12:39:25 +0100 Subject: [PATCH 4/7] Fix parse of usb device description with multiple configurations RH-Author: Gerd Hoffmann Message-id: <1326199166-8305-4-git-send-email-kraxel@redhat.com> Patchwork-id: 36314 O-Subject: [RHEL-6.3 qemu-kvm PATCH 3/4] Fix parse of usb device description with multiple configurations Bugzilla: 746866 RH-Acked-by: Hans de Goede RH-Acked-by: Markus Armbruster RH-Acked-by: Alex Williamson From: Cao,Bing Bu Changed From V1: Use DPRINTF instead of fprintf,because it is not an error. When testing ipod on QEMU by He Jie Xu,qemu made a assertion. We found that the ipod with 2 configurations,and the usb-linux did not parse the descriptor correctly. The descr_len returned is the total length of the all configurations,not one configuration. The older version will through the other configurations instead of skip,continue parsing the descriptor of interfaces/endpoints in other configurations,then went wrong. This patch will put the configuration descriptor parse in loop outside and dispel the other configurations not requested. Signed-off-by: Cao,Bing Bu Signed-off-by: Gerd Hoffmann (cherry picked from commit 7279a85f37a9cf20b15c86159f0a1f01ce9cead4) --- usb-linux.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) Signed-off-by: Michal Novotny --- usb-linux.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/usb-linux.c b/usb-linux.c index 41c2dbb..c5f6ed0 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -1113,15 +1113,18 @@ static int usb_linux_update_endp_table(USBHostDevice *s) length = s->descr_len - 18; i = 0; - if (descriptors[i + 1] != USB_DT_CONFIG || - descriptors[i + 5] != s->configuration) { - fprintf(stderr, "invalid descriptor data - configuration %d\n", - s->configuration); - return 1; - } - i += descriptors[i]; - while (i < length) { + if (descriptors[i + 1] != USB_DT_CONFIG) { + fprintf(stderr, "invalid descriptor data\n"); + return 1; + } else if (descriptors[i + 5] != s->configuration) { + DPRINTF("not requested configuration %d\n", s->configuration); + i += (descriptors[i + 3] << 8) + descriptors[i + 2]; + continue; + } + + i += descriptors[i]; + if (descriptors[i + 1] != USB_DT_INTERFACE || (descriptors[i + 1] == USB_DT_INTERFACE && descriptors[i + 4] == 0)) { -- 1.7.7.5