uefi-ref/edk2
1
0
Fork 0
mirror of https://github.com/tianocore/edk2 synced 2026-08-27 00:23:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 794a55b1fd into fb2ac429de

Browse source
This commit is contained in:
Marlboro Chuang 2026-08-27 09:00:35 +08:00 • committed by GitHub
commit 2bb6f8dc17
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
View file

@ -9,6 +9,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include "UsbBus.h"
#define INTERFACE_NOT_SET 0xFF
/**
Free the interface setting descriptor.
@ -394,6 +396,7 @@ UsbParseConfigDesc (
UINTN Index;
UINTN NumIf;
UINTN Consumed;
UINT8 FirstIntfNum;
ASSERT (DescBuf != NULL);
@ -441,6 +444,8 @@ UsbParseConfigDesc (
DescBuf += Consumed;
Len -= Consumed;
FirstIntfNum = INTERFACE_NOT_SET;
//
// Make allowances for devices that return extra data at the
// end of their config descriptors
@ -448,10 +453,19 @@ UsbParseConfigDesc (
while (Len >= sizeof (EFI_USB_INTERFACE_DESCRIPTOR)) {
Setting = UsbParseInterfaceDesc (DescBuf, Len, &Consumed);
// Usb standard spec expects the interface number to start from 0.
// Some devices might have the first interface number not equal to zero.
// This is a work around for these devices. For example, Dell WWAN DW2811e
if (Setting != NULL) {
if (FirstIntfNum == INTERFACE_NOT_SET) {
FirstIntfNum = Setting->Desc.InterfaceNumber;
}
}
if (Setting == NULL) {
DEBUG ((DEBUG_ERROR, "UsbParseConfigDesc: warning: failed to get interface setting, stop parsing now.\n"));
break;
} else if (Setting->Desc.InterfaceNumber >= NumIf) {
} else if (Setting->Desc.InterfaceNumber >= (NumIf + FirstIntfNum)) {
DEBUG ((DEBUG_ERROR, "UsbParseConfigDesc: malformatted interface descriptor\n"));
UsbFreeInterfaceDesc (Setting);
@ -461,7 +475,7 @@ UsbParseConfigDesc (
//
// Insert the descriptor to the corresponding set.
//
Interface = Config->Interfaces[Setting->Desc.InterfaceNumber];
Interface = Config->Interfaces[(Setting->Desc.InterfaceNumber - FirstIntfNum)];
if (Interface->NumOfSetting >= USB_MAX_INTERFACE_SETTING) {
goto ON_ERROR;

13
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
View file

@ -417,6 +417,19 @@ UsbSelectConfig (
// the endpoint toggles to zero for its endpoints.
//
IfDesc = ConfigDesc->Interfaces[Index];
//
// Protect against hang. This is added to work around faulty device like Digidesign Mbox3 mini
//
if ((IfDesc == NULL) || (IfDesc->Settings[0] == NULL)) {
//
// If UsbCreateDesc() bailed on an interface or endpoint desc, don't try to
// configure that interface here.
//
DEBUG ((DEBUG_INFO, "UsbSelectConfig: Skipping uninitialized interface %d.\n", Index));
continue;
}
UsbSelectSetting (IfDesc, IfDesc->Settings[0]->Desc.AlternateSetting);
//