Skip to content

Commit 4a53c6a

Browse files
authored
Revert "Stop USB enumeration in case a malformed descriptor is found (#410)" (#493)
## Description This reverts commit 714d41b. Some devices are dependent on this functionality and can be important sources of input during boot. Until a more robust solution is devised that can support these devices, this change is reverted. - [x] Impacts functionality? - **Functionality** - Does the change ultimately impact how firmware functions? - Examples: Add a new library, publish a new PPI, update an algorithm, ... - [ ] Impacts security? - **Security** - Does the change have a direct security impact on an application, flow, or firmware? - Examples: Crypto algorithm change, buffer overflow fix, parameter validation improvement, ... - [ ] Breaking change? - **Breaking change** - Will anyone consuming this change experience a break in build or boot behavior? - Examples: Add a new library class, move a module to a different repo, call a function in a new library class in a pre-existing module, ... - [ ] Includes tests? - **Tests** - Does the change include any explicit test code? - Examples: Unit tests, integration tests, robot tests, ... - [ ] Includes documentation? - **Documentation** - Does the change contain explicit documentation additions outside direct code modifications (and comments)? - Examples: Update readme file, add feature readme file, link to documentation on an a separate Web page, ... ## How This Was Tested Verified a USB mass storage device that failed to enumerate with the change can be enumerated after reverting it. ## Integration Instructions N/A Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
1 parent 3f022da commit 4a53c6a

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ UsbParseConfigDesc (
396396

397397
if (Setting == NULL) {
398398
DEBUG ((DEBUG_ERROR, "UsbParseConfigDesc: warning: failed to get interface setting, stop parsing now.\n"));
399-
goto ON_ERROR; // MU_CHANGE
399+
break;
400400
} else if (Setting->Desc.InterfaceNumber >= NumIf) {
401401
DEBUG ((DEBUG_ERROR, "UsbParseConfigDesc: malformatted interface descriptor\n"));
402402

0 commit comments

Comments
 (0)