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.136; helo=mga12.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 539B82249273B for ; Fri, 2 Mar 2018 05:47:03 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2018 05:53:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,412,1515484800"; d="scan'208";a="34146852" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga004.fm.intel.com with ESMTP; 02 Mar 2018 05:53:12 -0800 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 2 Mar 2018 05:53:12 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 2 Mar 2018 05:53:12 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.125]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.116]) with mapi id 14.03.0319.002; Fri, 2 Mar 2018 21:53:10 +0800 From: "Gao, Liming" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Lin, Jie" , "Zhu, Yonghong" Thread-Topic: [PATCH 2/2] MdePkg/DevicePathFromText: Fix byte orders when handling 8-byte array Thread-Index: AQHTshzweNkqQBuASEK+JRjTLlAVSqO891vQ Date: Fri, 2 Mar 2018 13:53:09 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E1D6713@SHSMSX104.ccr.corp.intel.com> References: <20180302115206.143528-1-ruiyu.ni@intel.com> <20180302115206.143528-3-ruiyu.ni@intel.com> In-Reply-To: <20180302115206.143528-3-ruiyu.ni@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 2/2] MdePkg/DevicePathFromText: Fix byte orders when handling 8-byte array X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Mar 2018 13:47:04 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Ni, Ruiyu > Sent: Friday, March 2, 2018 7:52 PM > To: edk2-devel@lists.01.org > Cc: Lin, Jie ; Gao, Liming ; Zhu= , Yonghong > Subject: [PATCH 2/2] MdePkg/DevicePathFromText: Fix byte orders when hand= ling 8-byte array >=20 > Per UEFI spec, FibreEx.WWN, FibreEx.Lun, SasEx.Address, SasEx.Lun > and iSCSI.Lun are all 8-byte array with byte #0 in the left. > It means "0102030405060708" should be converted to: > UINT8[8] =3D {01, 02, 03, 04, 05, 06, 07, 08} > or UINT64 =3D {0807060504030201} >=20 > Today's implementation wrongly uses the reversed order. > The patch fixes this issue by using StrHexToBytes(). >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni > Cc: Jie Lin > Cc: Liming Gao > Cc: Yonghong Zhu > --- > .../Library/UefiDevicePathLib/DevicePathFromText.c | 32 ++++++++++++++--= ------ > 1 file changed, 20 insertions(+), 12 deletions(-) >=20 > diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c b/MdeP= kg/Library/UefiDevicePathLib/DevicePathFromText.c > index c66b77ba6c..63cbc9449b 100644 > --- a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c > +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c > @@ -1140,11 +1140,14 @@ DevPathFromTextFibreEx ( > ); >=20 > FibreEx->Reserved =3D 0; > - Strtoi64 (WWNStr, (UINT64 *) (&FibreEx->WWN)); > - Strtoi64 (LunStr, (UINT64 *) (&FibreEx->Lun)); > - > - *(UINT64 *) (&FibreEx->WWN) =3D SwapBytes64 (*(UINT64 *) (&FibreEx->WW= N)); > - *(UINT64 *) (&FibreEx->Lun) =3D SwapBytes64 (*(UINT64 *) (&FibreEx->Lu= n)); > + StrHexToBytes ( > + WWNStr, sizeof (FibreEx->WWN) * 2, > + FibreEx->WWN, sizeof (FibreEx->WWN) > + ); > + StrHexToBytes ( > + LunStr, sizeof (FibreEx->Lun) * 2, > + FibreEx->Lun, sizeof (FibreEx->Lun) > + ); >=20 > return (EFI_DEVICE_PATH_PROTOCOL *) FibreEx; > } > @@ -1546,8 +1549,6 @@ DevPathFromTextSasEx ( > CHAR16 *DriveBayStr; > UINT16 Info; > UINT16 Uint16; > - UINT64 SasAddress; > - UINT64 Lun; > SASEX_DEVICE_PATH *SasEx; >=20 > AddressStr =3D GetNextParamStr (&TextDeviceNode); > @@ -1563,10 +1564,14 @@ DevPathFromTextSasEx ( > (UINT16) sizeof (SASEX_DEVICE_PA= TH) > ); >=20 > - Strtoi64 (AddressStr, &SasAddress); > - Strtoi64 (LunStr, &Lun); > - WriteUnaligned64 ((UINT64 *) &SasEx->SasAddress, SwapBytes64 (SasAddre= ss)); > - WriteUnaligned64 ((UINT64 *) &SasEx->Lun, SwapBytes64 (Lun)); > + StrHexToBytes ( > + AddressStr, sizeof (SasEx->SasAddress) * 2, > + SasEx->SasAddress, sizeof (SasEx->SasAddress) > + ); > + StrHexToBytes ( > + LunStr, sizeof (SasEx->Lun) * 2, > + SasEx->Lun, sizeof (SasEx->Lun) > + ); > SasEx->RelativeTargetPort =3D (UINT16) Strtoi (RTPStr); >=20 > if (StrCmp (SASSATAStr, L"NoTopology") =3D=3D 0) { > @@ -2560,7 +2565,10 @@ DevPathFromTextiSCSI ( > StrToAscii (NameStr, &AsciiStr); >=20 > ISCSIDevPath->TargetPortalGroupTag =3D (UINT16) Strtoi (PortalGroupStr= ); > - Strtoi64 (LunStr, &ISCSIDevPath->Lun); > + StrHexToBytes ( > + LunStr, sizeof (ISCSIDevPath->Lun) * 2, > + (UINT8 *)&ISCSIDevPath->Lun, sizeof (ISCSIDevPath->Lun) > + ); >=20 > Options =3D 0x0000; > if (StrCmp (HeaderDigestStr, L"CRC32C") =3D=3D 0) { > -- > 2.16.1.windows.1