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 <[email protected]>
Cc: Jie Lin <[email protected]>
Cc: Liming Gao <[email protected]>
Cc: Yonghong Zhu <[email protected]>
---
.../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
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
