From nobody Sun Feb 27 16:47:54 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 540F619EA4B9; Sun, 27 Feb 2022 16:47:55 +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 4K68Zf5BJRz4m5q; Sun, 27 Feb 2022 16:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980475; 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=ZC7gDTSkavjpRCBOsFVHbGudpbIh/nSJcDT27ghDhdc=; b=uwQPq7rowjVtQQQMNoRhzmABGBy4OUHbTBT5AjADxAFxfVMo5LxkEpKQuVCHGMT0H+0iWV LOi/knnquZBdJeGwEgC0VTesUyvJM29I6oIhiXlSeAQ8BQ71q4H+ku611ue9JdwMvzHxPt JqbEuxQw7HkZyOp2GJIqepKZV9cpQiN0otMysgt91Daw6EVV1Sgkd0IyfYAjvdo76nikIi DJA3fs9VFbk+Ot6pEsoYk1yPqmdRBDzakFSjGdlgCAGghGSf5HgiGIttr5AfNuijmopF9z +qq1kSXxjvO3Z4EYOvbZMGvuj2UK5VkQjkvA5Erc5fkhr6L/N2SmiyLRrfQNnQ== 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 3749A2D2E; Sun, 27 Feb 2022 16:47:54 +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 21RGlspp037051; Sun, 27 Feb 2022 16:47:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RGlsr8037050; Sun, 27 Feb 2022 16:47:54 GMT (envelope-from git) Date: Sun, 27 Feb 2022 16:47:54 GMT Message-Id: <202202271647.21RGlsr8037050@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: c1fa6f4c5d4b - main - libefivar: Fix incorrect check for DisplayOnly text format in AcpiEx 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: c1fa6f4c5d4bf40116d2d1522dd1561a7e4d8eea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980475; 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=ZC7gDTSkavjpRCBOsFVHbGudpbIh/nSJcDT27ghDhdc=; b=L7YK1tbaTpepOlfrd6srSmwwLNiE/swLI+GdqBC3gg8o/6KmTzbJuGok5ez6svZtovdMhu GttfUSs344+g/Wmb5b2zQ8JSAyZITTOWw/SlSFropg1HiFSRVHw58Ps+naWz0vCZr+AjF7 6n7YXtG8Cj4qQpa6rTNYPGi5+SnxGRPzmveq086o0IaEei2W34rXjcq02UCQ3jASSFPx8l w+CckfoTj20fWsGiJ3wuHpkC0f/CLHbWpKwYUjpq019Vtbq9ezu+UFh81a+fH2BuGdohZt +bm/cUdUdzbjSuD+MSZxVayGd1YgRj+t006DaB3r4wJMdRpmorwf/oBJN6lj8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645980475; a=rsa-sha256; cv=none; b=wU+OsjrPbv9kIFuatmcZgVi9Gstlom+jVF9duRvBDj2ypdWmdIMqyfQptpsA7q4BZdyqCW zEAVN/6qS3Dpf00RbXyn2d5TC7+fgvmbQLjSUto8nMyTtRhhPbjHsBFWBLy4zF5HJwXy8F rWer1qUr25KdaH6uIBLlQUh13Sf0GftEFtemNI6qM15qGrv5TsXeJpjPRibi95qYge/hg5 7GtKC4lC+S1q91C61+LkPCkndshWSTbyZc+UsRUZWoPjYtkA7oj83Q1cMEGU4FhaxqgTjR D3PeVklrOFH/L6o0ZDnD/kqI71Tam1HVoAqWUbwu6HwF47WRze9CelIsRd0ayg== 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=c1fa6f4c5d4bf40116d2d1522dd1561a7e4d8eea commit c1fa6f4c5d4bf40116d2d1522dd1561a7e4d8eea Author: Jose Luis Duran AuthorDate: 2022-02-24 00:47:18 +0000 Commit: Warner Losh CommitDate: 2022-02-27 16:13:35 +0000 libefivar: Fix incorrect check for DisplayOnly text format in AcpiEx Text format for AcpiEx device path in UEFI Spec: AcpiEx(HID,CID,UID,HIDSTR,CIDSTR,UIDSTR) AcpiEx(HID|HIDSTR,(CID|CIDSTR,UID|UIDSTR))(Display Only) When convert device path to text for AcpiEx device path, current code check AllowShortcuts parameter to convert the device path to DisplayOnly text format(shorter text representation) by mistake. It should check DisplayOnly parameter. This commit is to fix this issue. Upstream Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=1312 Obtained from: https://github.com/tianocore/edk2/commit/e9ab1635a2cfa1cb588996dcd5cc157fb44decb1 Pull Request: https://github.com/freebsd/freebsd-src/pull/581 --- lib/libefivar/efivar-dp-format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c index 0062216ac307..9c1969d81423 100644 --- a/lib/libefivar/efivar-dp-format.c +++ b/lib/libefivar/efivar-dp-format.c @@ -556,7 +556,7 @@ DevPathToTextAcpiEx ( ); } } else { - if (AllowShortcuts) { + if (DisplayOnly) { // // display only //