From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A3ABA2035BB1E for ; Fri, 17 Nov 2017 10:15:00 -0800 (PST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Nov 2017 10:19:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,410,1505804400"; d="scan'208";a="2820444" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.51]) by fmsmga004.fm.intel.com with ESMTP; 17 Nov 2017 10:19:11 -0800 From: Michael D Kinney To: edk2-devel@lists.01.org Cc: Star Zeng , Eric Dong Date: Fri, 17 Nov 2017 10:19:06 -0800 Message-Id: <20171117181906.14380-3-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20171117181906.14380-1-michael.d.kinney@intel.com> References: <20171117181906.14380-1-michael.d.kinney@intel.com> Subject: [Patch V4 2/2] MdeModulePkg/UsbMassStorageDxe: Check Get Max LUN status/value X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Nov 2017 18:15:00 -0000 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 Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney --- .../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.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
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