From nobody Sun Feb 27 16:47:41 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 352C819E9A39; Sun, 27 Feb 2022 16:47:42 +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 4K68ZP6BpSz4lWx; Sun, 27 Feb 2022 16:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980461; 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=YNRBvf56CRqaC7Cgo4zyQ65vi58BSVzAglhFbJiJEjc=; b=lP78KeqUb89U+IY4RLBmuv5QJIznRkgFHOATU++caUc1mUUqkwjfJjV99+sqQTwHMI3W3s ncBVArazaYmoHSPT+0sBRXJM4pROBKg+4IkufkAIYSOqOJExQbKn0U7G3WnU2rvvWeKuzz jZe6N2f3XTooQrYEvGUEt8l+j4KEaWQvUl8TlUwU/UVDy7XR4VmtsXQkcyCoZhfCIX3DsT YXMbxXth4ef4uqTQDdAE/INWfdSq8J3LCkIUkz0iY8Dj4UJK1U12QpxAJEWgHy/F+2Ti7K Dcx1NabGJVXBmg795AAU4vnBiJpCX5pOIIx+/Y6/rqL5jDY41Xwl3NBEY8QJVw== 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 A3CFF2ACD; Sun, 27 Feb 2022 16:47:41 +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 21RGlfug036775; Sun, 27 Feb 2022 16:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RGlfdv036774; Sun, 27 Feb 2022 16:47:41 GMT (envelope-from git) Date: Sun, 27 Feb 2022 16:47:41 GMT Message-Id: <202202271647.21RGlfdv036774@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: 76ed5f1b2622 - main - libefivar: Fix bug when converting iSCSI node 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: 76ed5f1b2622892dff0468c2c94ba0c27b6d3dde Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980461; 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=YNRBvf56CRqaC7Cgo4zyQ65vi58BSVzAglhFbJiJEjc=; b=Qu0np2+P3if33fyd/Na20uWBaVTqF2puJ7S1egbX4I0/hJazT0GkAmjiDRzQH3m+aJ32mP ztiTf0qq9QKiUdiN0X7t3USI8xZiQZIANfop1vDhjIZZW4/uqBwP0VVuWr3Mrz5QJnEHYG 5PFU+V2ecdzlko3VSe00iEtNqEYicu0+9/90ZOU0cIgq7/Wjq8k7TIe0Ou0Pzuh4mlOXnQ Psf0jQ84Nl14lsVP/W2JIuWeZptM9p3635uDcvhKO929TUeJWoA2sFrB4cC2uyJ2kBjPMU tuHSGoj5aGJpRavKcwAzl9XRHEK2AxOQSw+URZLsCGdgtpUlw9r8jmdgWWbFwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645980461; a=rsa-sha256; cv=none; b=D4bVcRzGPSM9ot0FlHNx7Vg3UWeFAGr/lTd7C9cC7axGnGorkAJqV1QT/Ax8JrNUO16Gs7 Y1ou38g9zXc7M2JHdDXN2cmqYjo3WiS1F4rlaUykTbqnR7S4p4w12A7avY/GYr6TTr4JXg C8zgQac8RDPdncP3++kpasJp9pOQ5lMMK4TeOM93SxMVbsVImTp/4zJnMd2aeZBnT68UBh wMPQ6Px7ChsIVeIDZo7x6IvwA3Z9Z+YavGq27KKMVnmqc+2RGpMmhd6aSQW09AVhiZJuoI M3zYZ0tNsEAaNtTOIApfhZQVGbN3q8P//B2IdJMdhjU9ERSwFeZ8wwjakZBNuw== 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=76ed5f1b2622892dff0468c2c94ba0c27b6d3dde commit 76ed5f1b2622892dff0468c2c94ba0c27b6d3dde Author: Jose Luis Duran AuthorDate: 2022-02-24 01:46:19 +0000 Commit: Warner Losh CommitDate: 2022-02-27 16:12:41 +0000 libefivar: Fix bug when converting iSCSI node If protocol string is not specified, default TCP(0) should be used. Today's implementation wrongly sets to 1 for this case. Obtained from: https://github.com/tianocore/edk2/commit/e6c80aea71c7b7c6c22ed779d23bf7877a97e68d Pull Request: https://github.com/freebsd/freebsd-src/pull/581 --- lib/libefivar/efivar-dp-parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c index b755ea4a6146..c527607c7184 100644 --- a/lib/libefivar/efivar-dp-parse.c +++ b/lib/libefivar/efivar-dp-parse.c @@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$"); /** @file DevicePathFromText protocol as defined in the UEFI 2.0 specification. -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 @@ -2725,7 +2725,7 @@ DevPathFromTextiSCSI ( ISCSIDevPath->LoginOption = (UINT16) Options; - if (StrCmp (ProtocolStr, "TCP") == 0) { + if (IS_NULL (*ProtocolStr) || (StrCmp (ProtocolStr, "TCP") == 0)) { ISCSIDevPath->NetworkProtocol = 0; } else { //