diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2017-11-14 15:41:08 -0800 |
|---|---|---|
| committer | Michael D Kinney <michael.d.kinney@intel.com> | 2017-11-20 14:43:28 -0800 |
| commit | b4e96b82b4e2e47e95014b51787ba5b43abac784 (patch) | |
| tree | 62f8acf40a98193afec1a7c01fab66b500dca750 /MdeModulePkg/Bus/Usb | |
| parent | b8c6c545385da1fec9f0851e2d4f1b769ff121af (diff) | |
| download | edk2-b4e96b82b4e2e47e95014b51787ba5b43abac784.tar.gz edk2-b4e96b82b4e2e47e95014b51787ba5b43abac784.tar.bz2 edk2-b4e96b82b4e2e47e95014b51787ba5b43abac784.zip | |
MdeModulePkg/UsbBusDxe: Add UsbControlTransfer() error check
https://bugzilla.tianocore.org/show_bug.cgi?id=767
The USB I/O Protocol function ControlTransfer() has a DataLength
parameter that specifies the size of the Data buffer. The
UsbBusDxe module implements the USB I/O Protocol using the
services of the USB2 Host Controller Protocol. The DataLength
parameter in the USB2 Host Controller Protocol ControlTransfer()
service is an IN OUT parameter so the number of bytes actually
transferred is returned. Since the USB I/O Protocol
ControlTransfer() service can not return the number of bytes
actually transferred, the only option if the number of bytes
actually transferred is less than the number of bytes requested
is to return EFI_DEVICE_ERROR.
The change fixes an issue with a USB mass storage device that
responds with 0 bytes to the Get MAX LUN command.
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Diffstat (limited to 'MdeModulePkg/Bus/Usb')
| -rw-r--r-- | MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c index 78220222f6..7c58fe8d36 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c @@ -2,7 +2,7 @@ Usb Bus Driver Binding and Bus IO Protocol.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -76,6 +76,7 @@ UsbIoControlTransfer ( USB_ENDPOINT_DESC *EpDesc;
EFI_TPL OldTpl;
EFI_STATUS Status;
+ UINTN RequestedDataLength;
if (UsbStatus == NULL) {
return EFI_INVALID_PARAMETER;
@@ -86,6 +87,7 @@ UsbIoControlTransfer ( UsbIf = USB_INTERFACE_FROM_USBIO (This);
Dev = UsbIf->Device;
+ RequestedDataLength = DataLength;
Status = UsbHcControlTransfer (
Dev->Bus,
Dev->Address,
@@ -99,6 +101,18 @@ UsbIoControlTransfer ( &Dev->Translator,
UsbStatus
);
+ //
+ // If the request completed sucessfully and the Direction of the request is
+ // EfiUsbDataIn or EfiUsbDataOut, then make sure the actual number of bytes
+ // transfered is the same as the number of bytes requested. If a different
+ // number of bytes were transfered, then return EFI_DEVICE_ERROR.
+ //
+ if (!EFI_ERROR (Status)) {
+ if (Direction != EfiUsbNoData && DataLength != RequestedDataLength) {
+ Status = EFI_DEVICE_ERROR;
+ goto ON_EXIT;
+ }
+ }
if (EFI_ERROR (Status) || (*UsbStatus != EFI_USB_NOERROR)) {
//
|