From nobody Sun Feb 27 16:47:42 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F292D19E9ADB; Sun, 27 Feb 2022 16:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K68ZR16Jbz4lxD; Sun, 27 Feb 2022 16:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jj8mX5MxmnTLNwEU6xHATzETu+6vpBLqghwbNzOxFjQ=; b=KhVB40MqCBbIXnKOnCyFEI5x6S04ez0g5Bvbh+g9kAShhe3+rscUUBfEjI3aLUuzj/syVq 8v5ZK0uj6CaTEqI59UC0sj2sKDD0e2W8NGgEK6SEFll4EENiR3X38SJApDquOAESgKJcKp C+Iy3tdVhmaNMu8UljhoANS+npjx1BfA30e56tBLWOtuSmYQsMB0C+vzXVB+s5wWWkm+M3 t07mvulZ9RxKtybi5CN1X3sP8qzcHp0VTPBr7VExsr9j0odJnyj/sPMGv8+btJv8U9iSwl Z4WL4cM4fOu5ktVouIn7HAiCFzNtFRaxL2go+rMt5KR02+1oRKxPt4iBEuSuCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CB46D2A55; Sun, 27 Feb 2022 16:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21RGlglj036801; Sun, 27 Feb 2022 16:47:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RGlgPf036800; Sun, 27 Feb 2022 16:47:42 GMT (envelope-from git) Date: Sun, 27 Feb 2022 16:47:42 GMT Message-Id: <202202271647.21RGlgPf036800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: acfee0131adb - main - libefivar: Fix byte orders of iSCSI.Lun List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: acfee0131adb8bbfb2a2fbe4d17d4e0fae2897d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jj8mX5MxmnTLNwEU6xHATzETu+6vpBLqghwbNzOxFjQ=; b=YuULmMsyAHqQeDx2vo7EIGBBl0gZIRFkXxu4IE56tSbWEQ8QJDayOddiqm5S4ziTSp0uAN f6+7ecfzZOpsKPWecJd6hR2B9ib3ZeZpuz/P2Hg0WTDjcYtBsJ0jwgLWwyxuodZE77whAx SvIFxLVmDfhCmZY7jBm847dQxNuNsAOXuBlNtFsdTkTdU8qGzCM6AU4DjfCgiKYWE4j8w3 3mEnxyVyODn1tHtvlmIGt5jQNnQP0InE0JJXrJulIqOmyiec6feCuXyR8I8dGsxbq3f2l+ kF6I/Tpl3tEr/89JEcgCognmsx/YF54cKAPNUIvvtGuXVVTkQoivokOAW1FeLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645980463; a=rsa-sha256; cv=none; b=uCCElONA0v2RuiRUrOJqijNZc1edfjGHXR6g5JTcY5gUzbrTv7IazUAinbMuHaHmKMflsa N07uJfOs7TvdU7n9J3/UkuSXMgCya4mcuqpaiN211Ksl/U98TQlN895Sa60BRr9q+8m8T8 UuQmSdhWz9oMVB0ci/Lxm7SvwlYh9nt/5+DKl1v44S9hju/0JmMUQH4VL4Oi0dbpm6XisA 0nH9wbtsjcQ9WGzgrHnvnoMl1/YSQwLZH/+wBHEPXrRexbks5+3q4piP7Jf62V/ptWGlFT 2dFYc8JPJdOQCUuAHkOjriVgxjQpgcF3k8Bv4H0N4ZeG4m+Ipo5ANcjYIdd6OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=acfee0131adb8bbfb2a2fbe4d17d4e0fae2897d9 commit acfee0131adb8bbfb2a2fbe4d17d4e0fae2897d9 Author: Jose Luis Duran AuthorDate: 2022-02-24 01:55:30 +0000 Commit: Warner Losh CommitDate: 2022-02-27 16:12:47 +0000 libefivar: Fix byte orders of iSCSI.Lun Per UEFI spec, iSCSI.Lun is a 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. Obtained from: https://github.com/tianocore/edk2/commit/d0196be1e39c419223738d7181d4a5d8972792d0 Pull Request: https://github.com/freebsd/freebsd-src/pull/581 --- lib/libefivar/efivar-dp-parse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c index c527607c7184..5d5d0dfb7baa 100644 --- a/lib/libefivar/efivar-dp-parse.c +++ b/lib/libefivar/efivar-dp-parse.c @@ -2686,6 +2686,7 @@ DevPathFromTextiSCSI ( CHAR16 *ProtocolStr; CHAR8 *AsciiStr; ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath; + UINT64 Lun; NameStr = GetNextParamStr (&TextDeviceNode); PortalGroupStr = GetNextParamStr (&TextDeviceNode); @@ -2704,7 +2705,8 @@ DevPathFromTextiSCSI ( StrToAscii (NameStr, &AsciiStr); ISCSIDevPath->TargetPortalGroupTag = (UINT16) Strtoi (PortalGroupStr); - Strtoi64 (LunStr, &ISCSIDevPath->Lun); + Strtoi64 (LunStr, &Lun); + WriteUnaligned64 ((UINT64 *) &ISCSIDevPath->Lun, SwapBytes64 (Lun)); Options = 0x0000; if (StrCmp (HeaderDigestStr, "CRC32C") == 0) {