mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-30 09:04:07 +02:00
BaseTools: Fix byte orders when handling 8-byte array
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(). Copy this solution from MdePkg Hash version d0196be. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
parent
c1d6749b0e
commit
27db236ac2
@ -2387,6 +2387,7 @@ DevPathFromTextiSCSI (
|
|||||||
CHAR16 *ProtocolStr;
|
CHAR16 *ProtocolStr;
|
||||||
CHAR8 *AsciiStr;
|
CHAR8 *AsciiStr;
|
||||||
ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath;
|
ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath;
|
||||||
|
UINT64 Lun;
|
||||||
|
|
||||||
NameStr = GetNextParamStr (&TextDeviceNode);
|
NameStr = GetNextParamStr (&TextDeviceNode);
|
||||||
PortalGroupStr = GetNextParamStr (&TextDeviceNode);
|
PortalGroupStr = GetNextParamStr (&TextDeviceNode);
|
||||||
@ -2405,7 +2406,8 @@ DevPathFromTextiSCSI (
|
|||||||
StrToAscii (NameStr, &AsciiStr);
|
StrToAscii (NameStr, &AsciiStr);
|
||||||
|
|
||||||
ISCSIDevPath->TargetPortalGroupTag = (UINT16) Strtoi (PortalGroupStr);
|
ISCSIDevPath->TargetPortalGroupTag = (UINT16) Strtoi (PortalGroupStr);
|
||||||
Strtoi64 (LunStr, &ISCSIDevPath->Lun);
|
Strtoi64 (LunStr, &Lun);
|
||||||
|
WriteUnaligned64 ((UINT64 *) &ISCSIDevPath->Lun, SwapBytes64 (Lun));
|
||||||
|
|
||||||
Options = 0x0000;
|
Options = 0x0000;
|
||||||
if (StrCmp (HeaderDigestStr, L"CRC32C") == 0) {
|
if (StrCmp (HeaderDigestStr, L"CRC32C") == 0) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user