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.88; helo=mga01.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 35BAF2034BBF8 for ; Tue, 14 Nov 2017 20:18:33 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Nov 2017 20:22:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,398,1505804400"; d="scan'208";a="2786538" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga001.fm.intel.com with ESMTP; 14 Nov 2017 20:22:40 -0800 Received: from fmsmsx124.amr.corp.intel.com (10.18.125.39) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 14 Nov 2017 20:22:40 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx124.amr.corp.intel.com (10.18.125.39) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 14 Nov 2017 20:22:40 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.175]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002; Wed, 15 Nov 2017 12:22:38 +0800 From: "Zeng, Star" To: "Kinney, Michael D" , "edk2-devel@lists.01.org" CC: "Dong, Eric" , "Zeng, Star" Thread-Topic: [Patch V2 1/2] MdeModulePkg/UsbBusDxe: Add UsbControlTransfer() error check Thread-Index: AQHTXa2H/ytLztt6iUydELwL21GlBKMUukbg//98DYCAAIglMP//jJAAgACMLpA= Date: Wed, 15 Nov 2017 04:22:37 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103B9B56B2@shsmsx102.ccr.corp.intel.com> References: <20171115010236.1344-1-michael.d.kinney@intel.com> <20171115010236.1344-2-michael.d.kinney@intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103B9B550D@shsmsx102.ccr.corp.intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103B9B5581@shsmsx102.ccr.corp.intel.com> In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] 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 04:18:33 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Mike, UEFI spec, EFI_USB_IO_PROTOCOL.UsbControlTransfer(), in the description. Thanks, Star -----Original Message----- From: Kinney, Michael D=20 Sent: Wednesday, November 15, 2017 12:00 PM To: Zeng, Star ; edk2-devel@lists.01.org; Kinney, Mich= ael D Cc: Dong, Eric Subject: RE: [Patch V2 1/2] MdeModulePkg/UsbBusDxe: Add UsbControlTransfer(= ) error check Star, I am curious. Which spec statement are you referring to? Mike > -----Original Message----- > From: Zeng, Star > Sent: Tuesday, November 14, 2017 6:59 PM > To: Kinney, Michael D ;=20 > 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 > I do not insist on the check that the Direction is not EfiUsbNoData,=20 > and I know the functionality should have no improvement with the=20 > check. > So, you can have my Reviewed-by: Star Zeng . >=20 > I raised the question just for consideration from literally, as=20 > according to the spec, the code could not touch DataLength at all when=20 > Direction is EfiUsbNoData. >=20 > You can decide to have / have not the check when pushing. :) >=20 >=20 > Thanks, > Star > -----Original Message----- > From: Kinney, Michael D > Sent: Wednesday, November 15, 2017 10:46 AM > To: Zeng, Star ; edk2- devel@lists.01.org;=20 > Kinney, Michael D > Cc: Dong, Eric > Subject: RE: [Patch V2 1/2] MdeModulePkg/UsbBusDxe: Add > UsbControlTransfer() error check >=20 > Star, >=20 > For that case both DataLength and RequestedDataLength will be 0 and=20 > the new path will not be taken. >=20 > Are you concerned that the USB HC Protocol could return a non zero=20 > DataLength for the EfiUsbNoData case? Even if it does, the new path=20 > can never be taken because 0 is less than all UINTN values. >=20 > Mike >=20 > > -----Original Message----- > > From: Zeng, Star > > Sent: Tuesday, November 14, 2017 6:40 PM > > To: Kinney, Michael D ;=20 > > edk2-devel@lists.01.org > > Cc: Dong, Eric ; Zeng, Star > > > Subject: RE: [Patch V2 1/2] MdeModulePkg/UsbBusDxe: > Add > > UsbControlTransfer() error check > > > > Mike, > > > > Do you think it is better or not to also check the > Direction is not > > EfiUsbNoData? > > > > 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. > > > > 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 > > > > https://bugzilla.tianocore.org/show_bug.cgi?id=3D767 > > > > 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 > > 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(-) > > > > 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 @@ > > > > Usb Bus Driver Binding and Bus IO Protocol. > > > > -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; > > > > 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; > > > > + 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; > > + } > > > > if (EFI_ERROR (Status) || (*UsbStatus !=3D > > EFI_USB_NOERROR)) { > > // > > -- > > 2.14.2.windows.3