* [Patch V4 1/2] MdeModulePkg/UsbBusDxe: Add UsbControlTransfer() error check
2017-11-17 18:19 [Patch V4 0/2] Add Max LUN status/value checks Michael D Kinney
@ 2017-11-17 18:19 ` Michael D Kinney
2017-11-17 18:19 ` [Patch V4 2/2] MdeModulePkg/UsbMassStorageDxe: Check Get Max LUN status/value Michael D Kinney
2017-11-20 3:17 ` [Patch V4 0/2] Add Max LUN status/value checks Zeng, Star
2 siblings, 0 replies; 4+ messages in thread
From: Michael D Kinney @ 2017-11-17 18:19 UTC (permalink / raw)
To: edk2-devel; +Cc: Star Zeng, Eric Dong
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>
---
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
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)) {
//
--
2.14.2.windows.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Patch V4 2/2] MdeModulePkg/UsbMassStorageDxe: Check Get Max LUN status/value
2017-11-17 18:19 [Patch V4 0/2] Add Max LUN status/value checks Michael D Kinney
2017-11-17 18:19 ` [Patch V4 1/2] MdeModulePkg/UsbBusDxe: Add UsbControlTransfer() error check Michael D Kinney
@ 2017-11-17 18:19 ` Michael D Kinney
2017-11-20 3:17 ` [Patch V4 0/2] Add Max LUN status/value checks Zeng, Star
2 siblings, 0 replies; 4+ messages in thread
From: Michael D Kinney @ 2017-11-17 18:19 UTC (permalink / raw)
To: edk2-devel; +Cc: Star Zeng, Eric Dong
https://bugzilla.tianocore.org/show_bug.cgi?id=767
If a USB Mass Storage device does not support the Get
Max LUN command, then the USB I/O Protocol ControlTransfer()
service may return an error. If an error is returned for
this command, then assume that the device does not support
multiple LUNs and return a maximum LUN value of 0.
The USB Mass Storage Class Specification states that a
maximum LUN value larger than 0x0F is invalid. Add
a check to make sure this maximum LUN value is in this
valid range, and if it is not, then assume that the
device does not support multiple LUNs and return a
maximum LUN value of 0.
This change improves compatibility with USB FLASH drives
that do not support the Get Max LUN command or return
an invalid maximum LUN value.
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>
---
.../Bus/Usb/UsbMassStorageDxe/UsbMassBot.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
index 4bb7222b89..477bfa7952 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
@@ -2,7 +2,7 @@
Implementation of the USB mass storage Bulk-Only Transport protocol,
according to USB Mass Storage Class Bulk-Only Transport, Revision 1.0.
-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 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
@@ -552,8 +552,10 @@ UsbBotGetMaxLun (
UINT32 Result;
UINT32 Timeout;
- ASSERT (Context);
-
+ if (Context == NULL || MaxLun == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
UsbBot = (USB_BOT_PROTOCOL *) Context;
//
@@ -576,8 +578,20 @@ UsbBotGetMaxLun (
1,
&Result
);
+ if (EFI_ERROR (Status) || *MaxLun > USB_BOT_MAX_LUN) {
+ //
+ // If the Get LUN request returns an error or the MaxLun is larger than
+ // the maximum LUN value (0x0f) supported by the USB Mass Storage Class
+ // Bulk-Only Transport Spec, then set MaxLun to 0.
+ //
+ // This improves compatibility with USB FLASH drives that have a single LUN
+ // and either do not return a max LUN value or return an invalid maximum LUN
+ // value.
+ //
+ *MaxLun = 0;
+ }
- return Status;
+ return EFI_SUCCESS;
}
/**
--
2.14.2.windows.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Patch V4 0/2] Add Max LUN status/value checks
2017-11-17 18:19 [Patch V4 0/2] Add Max LUN status/value checks Michael D Kinney
2017-11-17 18:19 ` [Patch V4 1/2] MdeModulePkg/UsbBusDxe: Add UsbControlTransfer() error check Michael D Kinney
2017-11-17 18:19 ` [Patch V4 2/2] MdeModulePkg/UsbMassStorageDxe: Check Get Max LUN status/value Michael D Kinney
@ 2017-11-20 3:17 ` Zeng, Star
2 siblings, 0 replies; 4+ messages in thread
From: Zeng, Star @ 2017-11-20 3:17 UTC (permalink / raw)
To: Kinney, Michael D, edk2-devel@lists.01.org; +Cc: Dong, Eric, Zeng, Star
Reviewed-by: Star Zeng <star.zeng@intel.com>
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Michael D Kinney
Sent: Saturday, November 18, 2017 2:19 AM
To: edk2-devel@lists.01.org
Cc: Dong, Eric <eric.dong@intel.com>; Zeng, Star <star.zeng@intel.com>
Subject: [edk2] [Patch V4 0/2] Add Max LUN status/value checks
https://bugzilla.tianocore.org/show_bug.cgi?id=767
Changes in V4
* Fix return status from UsbGetMaxLun().
Changes in V3
* Only check number of bytes transfered if Direction is not UsbNoData.
Add error check to USB I/O Protocol UsbControlTransfer() for the number of bytes actually transfered. If less than requested, then return EFI_DEVICE_ERROR.
Check Get Max LUN status/value in USB Mass Storage Driver to handle cases where USB device does not support Get Max LUN command or returned an invalud Max LUN value.
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>
Michael D Kinney (2):
MdeModulePkg/UsbBusDxe: Add UsbControlTransfer() error check
MdeModulePkg/UsbMassStorageDxe: Check Get Max LUN status/value
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c | 16 +++++++++++++++-
.../Bus/Usb/UsbMassStorageDxe/UsbMassBot.c | 22 ++++++++++++++++++----
2 files changed, 33 insertions(+), 5 deletions(-)
--
2.14.2.windows.3
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 4+ messages in thread