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 92504220D4C07 for ; Tue, 14 Nov 2017 18:42:06 -0800 (PST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Nov 2017 18:46:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,397,1505804400"; d="scan'208";a="149593006" Received: from orsmsx101.amr.corp.intel.com ([10.22.225.128]) by orsmga004.jf.intel.com with ESMTP; 14 Nov 2017 18:46:13 -0800 Received: from orsmsx153.amr.corp.intel.com (10.22.226.247) by ORSMSX101.amr.corp.intel.com (10.22.225.128) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 14 Nov 2017 18:46:13 -0800 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.80]) by ORSMSX153.amr.corp.intel.com ([169.254.12.223]) with mapi id 14.03.0319.002; Tue, 14 Nov 2017 18:46:12 -0800 From: "Kinney, Michael D" To: "Zeng, Star" , "edk2-devel@lists.01.org" , "Kinney, Michael D" CC: "Dong, Eric" Thread-Topic: [Patch V2 1/2] MdeModulePkg/UsbBusDxe: Add UsbControlTransfer() error check Thread-Index: AQHTXbsGBWNUSpHQskCqhBHAc21bvaMUu3jg Date: Wed, 15 Nov 2017 02:46:11 +0000 Message-ID: References: <20171115010236.1344-1-michael.d.kinney@intel.com> <20171115010236.1344-2-michael.d.kinney@intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103B9B550D@shsmsx102.ccr.corp.intel.com> In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103B9B550D@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMTVmMWYxZWYtZjZiMy00YWJiLWE5MWEtOWIwZTcxNmViMzdkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjIuNS4xOCIsIlRydXN0ZWRMYWJlbEhhc2giOiJrcWFJM2xhZFwvbGVGSnpNbVlWbzJMWU0rKzRibGZicWdNXC9XS1l1NnNWTmw3U3g0dzU4dENaUzJXT3dOQXZrbFEifQ== dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Subject: Re: [Patch V2 1/2] MdeModulePkg/UsbBusDxe: Add UsbControlTransfer() error check 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: Wed, 15 Nov 2017 02:42:06 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Star, For that case both DataLength and RequestedDataLength will be 0 and the new path will not be taken. Are you concerned that the USB HC Protocol could return a non zero DataLength for the EfiUsbNoData case? Even if it does, the new path can never be taken because 0 is less than all UINTN values. Mike > -----Original Message----- > From: Zeng, Star > Sent: Tuesday, November 14, 2017 6:40 PM > To: Kinney, Michael D ; > edk2-devel@lists.01.org > Cc: Dong, Eric ; Zeng, Star > > Subject: RE: [Patch V2 1/2] MdeModulePkg/UsbBusDxe: Add > UsbControlTransfer() error check >=20 > Mike, >=20 > Do you think it is better or not to also check the > Direction is not EfiUsbNoData? >=20 > UEFI spec, EFI_USB_IO_PROTOCOL.UsbControlTransfer(): > If the Direction parameter is EfiUsbNoData, Data is > NULL, and DataLength is 0, then no data phase exists > for the control transfer. >=20 > Thanks, > Star > -----Original Message----- > From: Kinney, Michael D > Sent: Wednesday, November 15, 2017 9:03 AM > To: edk2-devel@lists.01.org > Cc: Zeng, Star ; Dong, Eric > > Subject: [Patch V2 1/2] MdeModulePkg/UsbBusDxe: Add > UsbControlTransfer() error check >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D767 >=20 > 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. >=20 > The change fixes an issue with a USB mass storage > device that responds with 0 bytes to the Get MAX LUN > command. >=20 > Cc: Star Zeng > Cc: Eric Dong > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael D Kinney > > --- > MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) >=20 > diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c > b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c > index 78220222f6..b0ad7938e9 100644 > --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c > +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c > @@ -2,7 +2,7 @@ >=20 > Usb Bus Driver Binding and Bus IO Protocol. >=20 > -Copyright (c) 2004 - 2016, Intel Corporation. All > rights reserved.
> +Copyright (c) 2004 - 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 @@ -76,6 +76,7 @@ UsbIoControlTransfer ( > USB_ENDPOINT_DESC *EpDesc; > EFI_TPL OldTpl; > EFI_STATUS Status; > + UINTN RequestedDataLength; >=20 > if (UsbStatus =3D=3D NULL) { > return EFI_INVALID_PARAMETER; > @@ -86,6 +87,7 @@ UsbIoControlTransfer ( > UsbIf =3D USB_INTERFACE_FROM_USBIO (This); > Dev =3D UsbIf->Device; >=20 > + RequestedDataLength =3D DataLength; > Status =3D UsbHcControlTransfer ( > Dev->Bus, > Dev->Address, > @@ -99,6 +101,10 @@ UsbIoControlTransfer ( > &Dev->Translator, > UsbStatus > ); > + if (!EFI_ERROR (Status) && DataLength < > RequestedDataLength) { > + Status =3D EFI_DEVICE_ERROR; > + goto ON_EXIT; > + } >=20 > if (EFI_ERROR (Status) || (*UsbStatus !=3D > EFI_USB_NOERROR)) { > // > -- > 2.14.2.windows.3