vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/bus/usb/usb.c (grub_usb_device_initialize): Add condition

Browse source 
to break endless loop.
This commit is contained in:
Melki Christian 2013-09-18 13:27:05 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent f163045985
commit 897c3bc634
2 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-09-18 Melki Christian <Christian.melki@saabgroup.com>
* grub-core/bus/usb/usb.c (grub_usb_device_initialize): Add condition
to break endless loop.
2013-08-23 Vladimir Serbinenko <phcoder@gmail.com> 2013-08-23 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-fstest.c: Fix several printf formats. * util/grub-fstest.c: Fix several printf formats.

34
grub-core/bus/usb/usb.c
View file

@ -148,6 +148,7 @@ grub_usb_device_initialize (grub_usb_device_t dev)
int pos; int pos;
int currif; int currif;
char *data; char *data;
struct grub_usb_desc *desc;
/* First just read the first 4 bytes of the configuration /* First just read the first 4 bytes of the configuration
descriptor, after that it is known how many bytes really have descriptor, after that it is known how many bytes really have
@ -174,18 +175,35 @@ grub_usb_device_initialize (grub_usb_device_t dev)
/* Read all interfaces. */ /* Read all interfaces. */
for (currif = 0; currif < dev->config[i].descconf->numif; currif++) for (currif = 0; currif < dev->config[i].descconf->numif; currif++)
{ {
while (pos < config.totallen while (pos < config.totallen)
&& ((struct grub_usb_desc *)&data[pos])->type {
!= GRUB_USB_DESCRIPTOR_INTERFACE) desc = (struct grub_usb_desc *)&data[pos];
pos += ((struct grub_usb_desc *)&data[pos])->length; if (desc->type == GRUB_USB_DESCRIPTOR_INTERFACE)
break;
if (!desc->length)
{
err = GRUB_USB_ERR_BADDEVICE;
goto fail;
}
pos += desc->length;
}
dev->config[i].interf[currif].descif dev->config[i].interf[currif].descif
= (struct grub_usb_desc_if *) &data[pos]; = (struct grub_usb_desc_if *) &data[pos];
pos += dev->config[i].interf[currif].descif->length; pos += dev->config[i].interf[currif].descif->length;
while (pos < config.totallen while (pos < config.totallen)
&& ((struct grub_usb_desc *)&data[pos])->type {
!= GRUB_USB_DESCRIPTOR_ENDPOINT) desc = (struct grub_usb_desc *)&data[pos];
pos += ((struct grub_usb_desc *)&data[pos])->length; if (desc->type == GRUB_USB_DESCRIPTOR_ENDPOINT)
break;
if (!desc->length)
{
err = GRUB_USB_ERR_BADDEVICE;
goto fail;
}
pos += desc->length;
}
/* Point to the first endpoint. */ /* Point to the first endpoint. */
dev->config[i].interf[currif].descendp dev->config[i].interf[currif].descendp