From nobody Mon Apr 29 00:12:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1519991533522719.5130514368125; Fri, 2 Mar 2018 03:52:13 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8FF3522546BBE; Fri, 2 Mar 2018 03:46:01 -0800 (PST) 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 880D122485A66 for ; Fri, 2 Mar 2018 03:45:59 -0800 (PST) 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:09 -0800 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:08 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; 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 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,412,1515484800"; d="scan'208";a="24581679" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Fri, 2 Mar 2018 19:52:05 +0800 Message-Id: <20180302115206.143528-2-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: [edk2] [PATCH 1/2] MdePkg/DevicePathFromText: Fix bug when converting iSCSI node 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" If protocol string is not specified, default TCP(0) should be used. Today's implementation wrongly sets to 1 for this case. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Cc: Yonghong Zhu Reviewed-by: Liming Gao --- MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c b/MdePkg= /Library/UefiDevicePathLib/DevicePathFromText.c index 0459f0ab25..c66b77ba6c 100644 --- a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c @@ -1,7 +1,7 @@ /** @file DevicePathFromText protocol as defined in the UEFI 2.0 specification. =20 -Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2013 - 2018, 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 @@ -2581,7 +2581,7 @@ DevPathFromTextiSCSI ( =20 ISCSIDevPath->LoginOption =3D (UINT16) Options; =20 - if (StrCmp (ProtocolStr, L"TCP") =3D=3D 0) { + if (IS_NULL (*ProtocolStr) || (StrCmp (ProtocolStr, L"TCP") =3D=3D 0)) { ISCSIDevPath->NetworkProtocol =3D 0; } else { // --=20 2.16.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 00:12:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1519991535797650.6537407757089; Fri, 2 Mar 2018 03:52:15 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EF9502255D6C2; Fri, 2 Mar 2018 03:46:01 -0800 (PST) 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) 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 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 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; 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 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,412,1515484800"; d="scan'208";a="24581683" From: Ruiyu Ni To: edk2-devel@lists.01.org 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: [edk2] [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: , Cc: Jie Lin , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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} 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 Reviewed-by: Liming Gao --- .../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 ( ); =20 FibreEx->Reserved =3D 0; - Strtoi64 (WWNStr, (UINT64 *) (&FibreEx->WWN)); - Strtoi64 (LunStr, (UINT64 *) (&FibreEx->Lun)); - - *(UINT64 *) (&FibreEx->WWN) =3D SwapBytes64 (*(UINT64 *) (&FibreEx->WWN)= ); - *(UINT64 *) (&FibreEx->Lun) =3D 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) + ); =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_PATH) ); =20 - 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 =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) { --=20 2.16.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel