sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-11 22:11:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

[efi] Fix reporting of USB supported languages array

Browse Source 
The length as returned by UsbGetSupportedLanguages() should not
include the length of the descriptor header itself.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2020-10-01 18:41:37 +01:00
parent 02280dc642
commit 0220141710
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/ipxe/efi/efi_usb.h
View File

@@ -24,7 +24,9 @@ struct efi_usb_device {
/** Configuration descriptor */ /** Configuration descriptor */
struct usb_configuration_descriptor *config; struct usb_configuration_descriptor *config;
/** Supported languages */ /** Supported languages */
struct usb_descriptor_header *languages; uint16_t *lang;
/** Length of supported languages */
size_t lang_len;
/** List of interfaces */ /** List of interfaces */
struct list_head interfaces; struct list_head interfaces;
}; };

25
src/interface/efi/efi_usb.c
View File

@@ -1044,9 +1044,8 @@ efi_usb_get_supported_languages ( EFI_USB_IO_PROTOCOL *usbio,
DBGC2 ( usbdev, "USBDEV %s get supported languages\n", usbintf->name ); DBGC2 ( usbdev, "USBDEV %s get supported languages\n", usbintf->name );
/* Return cached supported languages */ /* Return cached supported languages */
*languages = ( ( ( void * ) usbdev->languages ) + *languages = usbdev->lang;
sizeof ( *(usbdev->languages) ) ); *len = usbdev->lang_len;
*len = usbdev->languages->len;
return 0; return 0;
} }
@@ -1255,7 +1254,9 @@ static int efi_usb_probe ( struct usb_function *func,
struct efi_usb_interface *usbintf; struct efi_usb_interface *usbintf;
struct efi_device *efidev; struct efi_device *efidev;
struct usb_descriptor_header header; struct usb_descriptor_header header;
struct usb_descriptor_header *lang;
size_t config_len; size_t config_len;
size_t lang_len;
unsigned int i; unsigned int i;
int rc; int rc;
@@ -1275,9 +1276,12 @@ static int efi_usb_probe ( struct usb_function *func,
/* Assume no strings are present */ /* Assume no strings are present */
header.len = 0; header.len = 0;
} }
lang_len = ( ( header.len >= sizeof ( header ) ) ?
( header.len - sizeof ( header ) ) : 0 );
/* Allocate and initialise structure */ /* Allocate and initialise structure */
usbdev = zalloc ( sizeof ( *usbdev ) + config_len + header.len ); usbdev = zalloc ( sizeof ( *usbdev ) + config_len +
sizeof ( *lang ) + lang_len );
if ( ! usbdev ) { if ( ! usbdev ) {
rc = -ENOMEM; rc = -ENOMEM;
goto err_alloc; goto err_alloc;
@@ -1288,14 +1292,15 @@ static int efi_usb_probe ( struct usb_function *func,
usbdev->efidev = efidev; usbdev->efidev = efidev;
usbdev->config = ( ( ( void * ) usbdev ) + sizeof ( *usbdev ) ); usbdev->config = ( ( ( void * ) usbdev ) + sizeof ( *usbdev ) );
memcpy ( usbdev->config, config, config_len ); memcpy ( usbdev->config, config, config_len );
usbdev->languages = ( ( ( void * ) usbdev->config ) + config_len ); lang = ( ( ( void * ) usbdev->config ) + config_len );
usbdev->lang = ( ( ( void * ) lang ) + sizeof ( *lang ) );
usbdev->lang_len = lang_len;
INIT_LIST_HEAD ( &usbdev->interfaces ); INIT_LIST_HEAD ( &usbdev->interfaces );
/* Get supported languages descriptor */ /* Get supported languages descriptor, if applicable */
if ( header.len && if ( lang_len &&
( rc = usb_get_descriptor ( usb, 0, USB_STRING_DESCRIPTOR, 0, 0, ( ( rc = usb_get_descriptor ( usb, 0, USB_STRING_DESCRIPTOR,
usbdev->languages, 0, 0, lang, header.len ) ) != 0 ) ) {
header.len ) ) != 0 ) {
DBGC ( usbdev, "USBDEV %s could not get supported languages: " DBGC ( usbdev, "USBDEV %s could not get supported languages: "
"%s\n", usbdev->name, strerror ( rc ) ); "%s\n", usbdev->name, strerror ( rc ) );
goto err_get_languages; goto err_get_languages;