From nobody Sun Feb 27 16:47:34 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 636C719E93D6; Sun, 27 Feb 2022 16:47:35 +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 4K68ZH0C9gz4lcX; Sun, 27 Feb 2022 16:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980455; 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=VbMUOo07fp6Q7ixOXkkWJj67OfagLE6B6V/qLMEu8BY=; b=Zt5xU+y3ZMWBTPuW0CMW0CemghkVsfzDTAmuE5K5q5Sc6yRJBekwJgWhvgKJwBK17bwY/8 gwqcxZ+g+zZCGOYz4U57cN+TZ3T5Fc1U2shLP94i2lvKIvdfw9dhLQ8c2eWyLqz5hi8Ds8 KGD3EK0wshWpNmSTDj6RHfRiKuEUxo9lwYcmw7xDZE9Cdi6ovQRWj8KaqmIJ+yYly+o5Lo 17luRSh1RzFXQ1n0ROuKWCt0exxR7vHAaPTyYGvNvezBLGYoeHRbc3/LGUJZx1duPf/oiT PSUFavF9CV8hJ+JnUszxRX7xNPjD79bH9VLWV3oqqllb9yPVfCQV1A9Y7KzqDg== 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 BDD232C9A; Sun, 27 Feb 2022 16:47:34 +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 21RGlYQm036624; Sun, 27 Feb 2022 16:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RGlY75036623; Sun, 27 Feb 2022 16:47:34 GMT (envelope-from git) Date: Sun, 27 Feb 2022 16:47:34 GMT Message-Id: <202202271647.21RGlY75036623@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: 81a659e364e2 - main - libefivar: Fix the wrong MAC address length 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: 81a659e364e2ee84dd3220c0f87fb9add8fbfbed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980455; 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=VbMUOo07fp6Q7ixOXkkWJj67OfagLE6B6V/qLMEu8BY=; b=t2RBvq6QtYs8GH4npqf0lXR3kIEXysLZ+fpoIf8CIFf9RCPHVJbvJIpI4GZovwCSHHncBq /0qqXqhdjOkNZuXAAnmHShkQGTBkDBbnRKfSNNd7FAXyZq+GSnMAXrH9b5LK9sWAOfnlpd 53MV2yhz/pJzuy0Zr6HCHt3/syLZOLe3eJFD2FF31C6EeXwb+nXCn3fbWWbURFY7cI9CZl BIDgzl+bhawtTS9VC7Eh7/Hv2HJvDZ53V9yOaICY4xijYIEgUOh43Ie7Yr78wjOlFLE8Uh INDbh8amVQkYyRr8DuqZKBt0XUM+YkT48hWIcU8U1Nu1ekqjvoGeg8CiBm2jPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645980455; a=rsa-sha256; cv=none; b=lBoqJeeEy6xXWmYpkByia33XT+suJHwNZuxAyps2ax0xEhg0OaCTwUd4JGWN5b4HkVb+ux TIb8pYrK6L5WeHEMWIu8ZH2COCgq2YOookzifyqZw6HoURXmqhueulVb+b4a0X1IHbezeE 6wk6Nbi2LwumXXvcVxrHjuDb8Vj+jGoRZWqH16pQdOmIdz3kA7s9l6Ii5IH5/X1C8jwBN+ QkQK5YrKsq3g7nPXF+K2Qs41DAYrAJbVLYmtaR+5ODZWWFFapVnwqTUf7JV/A/0pMOGBLd VkqfWiYuOBeDsh1XnRxnfJYfBEN1kr9vLXvDrdnpsbv03cQvCnYOf95hAjRhFA== 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=81a659e364e2ee84dd3220c0f87fb9add8fbfbed commit 81a659e364e2ee84dd3220c0f87fb9add8fbfbed Author: Jose Luis Duran AuthorDate: 2022-02-25 14:47:53 +0000 Commit: Warner Losh CommitDate: 2022-02-27 16:11:55 +0000 libefivar: Fix the wrong MAC address length Network interface type should be checked before the conversion between text device path node and MAC device path. Otherwise, the MAC text string can't be converted to the representation of a device node, which leads to the series failure of network HII configuration(e.g. IP, VLAN, HTTP Boot configuration in Network Device List). Obtained from: https://github.com/tianocore/edk2/commit/2d67f2bae32040c77af8097a8ef1be272cb00e28 Pull Request: https://github.com/freebsd/freebsd-src/pull/581 --- lib/libefivar/efivar-dp-parse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c index 3fc4fd8a62fd..4040b001708d 100644 --- a/lib/libefivar/efivar-dp-parse.c +++ b/lib/libefivar/efivar-dp-parse.c @@ -1920,6 +1920,10 @@ DevPathFromTextMAC ( MACDevPath->IfType = (UINT8) Strtoi (IfTypeStr); Length = sizeof (EFI_MAC_ADDRESS); + if (MACDevPath->IfType == 0x01 || MACDevPath->IfType == 0x00) { + Length = 6; + } + StrHexToBytes (AddressStr, Length * 2, MACDevPath->MacAddress.Addr, Length); return (EFI_DEVICE_PATH_PROTOCOL *) MACDevPath;