From nobody Sun Feb 27 16:47:36 2022 X-Original-To: dev-commits-src-main@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 B593619E9472; Sun, 27 Feb 2022 16:47:37 +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 4K68ZK37Txz4lcl; Sun, 27 Feb 2022 16:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980457; 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=Vm7cOwmnub8VzgsrTtFp0pdGrSMDwythQA15IIAo0k8=; b=JYhn+hNtjJiN6jMzl4U/XY46CpVl8NVExN67NnpGsSFiPKCrsjvlcsxA0jnqutcst3vHnu 7LavRHQ5d3xYIPh4i/FVCbjSj1nEeG7We+SdpAvxZJGEbElqhJRfVPVEcyP46N5Y+MQ2GA zzoN49anFKwm0FeF8YcJX9wZVrKhQQ0Ylg/BwmmkxJMVcJJxLyKeKyIo3ZMZLNdFw+f3U6 13QayStEcnQh86NxAmVARfqvUq7H8ko2/kohO5jTkBE4IZD0kSJKaquPquVooCbwScy6Fv Q8XoCWIzvlZAw7839l34bACNPimfSn8rx1QnW1L1fRec2C7eazrY8yy4qwk9kQ== 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 19B382ACA; Sun, 27 Feb 2022 16:47:37 +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 21RGlaJB036677; Sun, 27 Feb 2022 16:47:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RGlaj8036676; Sun, 27 Feb 2022 16:47:36 GMT (envelope-from git) Date: Sun, 27 Feb 2022 16:47:36 GMT Message-Id: <202202271647.21RGlaj8036676@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: 7ca6daff6a43 - main - libefivar: Refine the DevPathFromTextiSCSI protocol parsing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 7ca6daff6a43f11fb93831e0970fb8bfb5d0833a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980457; 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=Vm7cOwmnub8VzgsrTtFp0pdGrSMDwythQA15IIAo0k8=; b=MTn0P5yi93CkBT09x4XnevUkazZuqy1CX2DPfa9RuhlIDQMpiglUHoQNCZ4UKWwg/RBjt3 R86RMUrZKlerVTyeQcHmfJt4yARRbRf1VkOOa3CC6J5JO68U7CYcvIr6UVIlmvPWAD6vCO KEp6yEieBtNG2L9KIU/v8MNDe0nzrvdRFy8O+3Nix+S2GVGYwFb6HMZ6pYGv3qEMjcBUha I/crX13zUPQx+zdi5+GA/YWI+tuwd3qaV43a21mfIbXDUwZa2EJM9BSreItoss25tMBvJY 2pgiJYKou5aYCcn9sJplGEabY/hrzFDc+oTGIHMTGE4Ns27cV3tMDCbgX5tUaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645980457; a=rsa-sha256; cv=none; b=s7BKPubwQoYKdQUpGteKd0ecAAg3gVbFAEyCx42FxZCiPI1Hi8q39Cx3PTqGbhM/naByt1 ORaQU53OaaUYCv7MLUXKvvuZm8RD55Wxdngl2SibfoNQREglR18uIxHd80tntEiFlCZZfQ PnhQLtE0REQkxR50MfORhYbrMfs2shJup8aBd185Cayr1GOgUE115ix8QIXWt53gpdoCRc xNe2QQ0WbHAnjudUZ75MG1dG5McXT7/PszRc8wW9nYoRTF19k5qn+nK0Bl9xyhxOjYGBgE hhky8+HZ7iMLmbqM26+9VrtTxa/WRllIIbs3QQZRS6LRqRnmUMU9iZhGP4hjbA== 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=7ca6daff6a43f11fb93831e0970fb8bfb5d0833a commit 7ca6daff6a43f11fb93831e0970fb8bfb5d0833a Author: Jose Luis Duran AuthorDate: 2022-02-24 01:43:27 +0000 Commit: Warner Losh CommitDate: 2022-02-27 16:12:18 +0000 libefivar: Refine the DevPathFromTextiSCSI protocol parsing For current iSCSI protocol parsing, UINT16 truncation may be happened. Since the Spec already have declaimed that 0 is TCP Protocol and 1+ is reserved, the parsing can be refined as below: if (StrCmp (ProtocolStr, L"TCP") == 0) { ISCSIDevPath->NetworkProtocol = 0; } else { // // Undefined and reserved. // ISCSIDevPath->NetworkProtocol = 1; } Obtained from: https://github.com/tianocore/edk2/commit/7571a1c191e19b48d33a33c8b7763b49999700ee Pull Request: https://github.com/freebsd/freebsd-src/pull/581 --- lib/libefivar/efivar-dp-parse.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c index 82f9c6027d32..02c32971f4c6 100644 --- a/lib/libefivar/efivar-dp-parse.c +++ b/lib/libefivar/efivar-dp-parse.c @@ -2725,7 +2725,14 @@ DevPathFromTextiSCSI ( ISCSIDevPath->LoginOption = (UINT16) Options; - ISCSIDevPath->NetworkProtocol = (UINT16) StrCmp (ProtocolStr, "TCP"); + if (StrCmp (ProtocolStr, "TCP") == 0) { + ISCSIDevPath->NetworkProtocol = 0; + } else { + // + // Undefined and reserved. + // + ISCSIDevPath->NetworkProtocol = 1; + } return (EFI_DEVICE_PATH_PROTOCOL *) ISCSIDevPath; }