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.120; helo=mga04.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 9920022485A7F for ; Fri, 2 Mar 2018 03:46:00 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2018 03:52:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,412,1515484800"; d="scan'208";a="24581683" Received: from unknown (HELO ray-dev.ccr.corp.intel.com) ([10.239.9.44]) by fmsmga002.fm.intel.com with ESMTP; 02 Mar 2018 03:52:09 -0800 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Jie Lin , Liming Gao , Yonghong Zhu Date: Fri, 2 Mar 2018 19:52:06 +0800 Message-Id: <20180302115206.143528-3-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180302115206.143528-1-ruiyu.ni@intel.com> References: <20180302115206.143528-1-ruiyu.ni@intel.com> Subject: [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 11:46:01 -0000 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] = {01, 02, 03, 04, 05, 06, 07, 08} or UINT64 = {0807060504030201} Today's implementation wrongly uses the reversed order. The patch fixes this issue by using StrHexToBytes(). 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(-) diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c b/MdePkg/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 ( ); FibreEx->Reserved = 0; - Strtoi64 (WWNStr, (UINT64 *) (&FibreEx->WWN)); - Strtoi64 (LunStr, (UINT64 *) (&FibreEx->Lun)); - - *(UINT64 *) (&FibreEx->WWN) = SwapBytes64 (*(UINT64 *) (&FibreEx->WWN)); - *(UINT64 *) (&FibreEx->Lun) = SwapBytes64 (*(UINT64 *) (&FibreEx->Lun)); + StrHexToBytes ( + WWNStr, sizeof (FibreEx->WWN) * 2, + FibreEx->WWN, sizeof (FibreEx->WWN) + ); + StrHexToBytes ( + LunStr, sizeof (FibreEx->Lun) * 2, + FibreEx->Lun, sizeof (FibreEx->Lun) + ); 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; AddressStr = GetNextParamStr (&TextDeviceNode); @@ -1563,10 +1564,14 @@ DevPathFromTextSasEx ( (UINT16) sizeof (SASEX_DEVICE_PATH) ); - Strtoi64 (AddressStr, &SasAddress); - Strtoi64 (LunStr, &Lun); - WriteUnaligned64 ((UINT64 *) &SasEx->SasAddress, SwapBytes64 (SasAddress)); - 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 = (UINT16) Strtoi (RTPStr); if (StrCmp (SASSATAStr, L"NoTopology") == 0) { @@ -2560,7 +2565,10 @@ DevPathFromTextiSCSI ( StrToAscii (NameStr, &AsciiStr); ISCSIDevPath->TargetPortalGroupTag = (UINT16) Strtoi (PortalGroupStr); - Strtoi64 (LunStr, &ISCSIDevPath->Lun); + StrHexToBytes ( + LunStr, sizeof (ISCSIDevPath->Lun) * 2, + (UINT8 *)&ISCSIDevPath->Lun, sizeof (ISCSIDevPath->Lun) + ); Options = 0x0000; if (StrCmp (HeaderDigestStr, L"CRC32C") == 0) { -- 2.16.1.windows.1