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

Skip incorrect USB devices.

Browse source 
* grub-core/bus/usb/usb.c (grub_usb_device_initialize): Fail if
	configcnt == 0.
	* include/grub/usb.h (grub_usb_err_t): New enum value
	GRUB_USB_ERR_BADDEVICE.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-05-16 02:39:25 +02:00
parent 638dbe4f27
commit ff44d107ad
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2011-05-16 Vladimir Serbinenko <phcoder@gmail.com>
Skip incorrect USB devices.
* grub-core/bus/usb/usb.c (grub_usb_device_initialize): Fail if
configcnt == 0.
* include/grub/usb.h (grub_usb_err_t): New enum value
GRUB_USB_ERR_BADDEVICE.
2011-05-16 Vladimir Serbinenko <phcoder@gmail.com> 2011-05-16 Vladimir Serbinenko <phcoder@gmail.com>
Fuloong video init support. Fuloong video init support.

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

@ -185,6 +185,12 @@ grub_usb_device_initialize (grub_usb_device_t dev)
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
dev->config[i].descconf = NULL; dev->config[i].descconf = NULL;
if (descdev->configcnt == 0)
{
err = GRUB_USB_ERR_BADDEVICE;
goto fail;
}
for (i = 0; i < descdev->configcnt; i++) for (i = 0; i < descdev->configcnt; i++)
{ {
int pos; int pos;

3
include/grub/usb.h
View file

@ -38,7 +38,8 @@ typedef enum
GRUB_USB_ERR_BABBLE, GRUB_USB_ERR_BABBLE,
GRUB_USB_ERR_TIMEOUT, GRUB_USB_ERR_TIMEOUT,
GRUB_USB_ERR_BITSTUFF, GRUB_USB_ERR_BITSTUFF,
GRUB_USB_ERR_UNRECOVERABLE GRUB_USB_ERR_UNRECOVERABLE,
GRUB_USB_ERR_BADDEVICE
} grub_usb_err_t; } grub_usb_err_t;
typedef enum typedef enum