From nobody Thu May 1 18:06:36 2025 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 4ZpMSY02Fwz5vVgb; Thu, 01 May 2025 18:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZpMSX4HXHz4BGD; Thu, 01 May 2025 18:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746122796; 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=RskDuyZBAsITmbhi8BawDvtZGIXsgdPTgocUKG40WS8=; b=RtqBUFBQEk02x2pOJlWLSNp0ivL+cPgiGNrrDrbkXe2yTl43ENWQpIpAQHbuwqKZ7t9aXf 6EE9S5g4mV42dvcgTTM0MvhlBIAq4iEM2y/gDpEFqTxdYZq2xT+pcbs9YyfIpvTM+BvhbQ vF37JsBStMRi9oPTXxc15wg8r49XZDy/JaAQKPk/+a07JcNiRNZLJZ2r9e5pFiKVegPCkk G6DdUeyNNuI54Nk/yFhWjmsjfWOqeQs9HOEm4xI2mIZxQgwj7pppQtx4/XbJW89ojleOnz DnOjV/D6H7m+/0rpOe9oWgyBb+TKDwu3H2AP7BkfL+wJeK6a/YeQQfRLVfjRYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746122796; 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=RskDuyZBAsITmbhi8BawDvtZGIXsgdPTgocUKG40WS8=; b=ksWLJrKAccxefWZF75+JS55QqsJ7RUA2ED1eDR/G0Gy7Ffkd6fRP/YhuEpXzXwHqgcFTbF QtgiWlSurJSJRhmZzCnscv8AA5LcFT+Pex4lVRCBc99KRMB7O7cQemKVpbkckoQO6urNiK Z3OyorhMvjYZJweleBInAoBJI0wEd48hr5t2Q6NXoghq6tV6o7VbxqqB/O6kmA+Z4xvIFr 9Iq9hoVmheQbJ9o8MR7l9z40lJKYudhz1gUfGF+V4yx9e/1dY1LiDZI6paqP75s8hMi26m ndb0NgfANQvKgG59fhhQ1F3KFnSzh816heQYDa9ScsGViiAK+HpDT47BN5WrcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746122796; a=rsa-sha256; cv=none; b=O0uRz/lF3aURJ/VPkjhoCab4bgLnxFuYY+F+9dmJGFhF0zKYHNQg2tHbSuZAMlXNqMW1+1 kpAamdr8g8Dtjfw6lChb2EGMUnzcPUjPWdlWLXjSPnwh/b51lcAC1199QvC4IVpfah9XoM stCIeS2n0sVB3Dft+vm4Vw/BrTOLYXJV59e/8zxKjyQW6C3FGyPGIN2PHk6ZFSF3Y0BNv/ 40/AJ14XW9q/H8GN/WMKJqiYTwzGXqdjec+bjOyWCc5jfgGNmGYyfV6k9+pwnjZQk7quTf 7IxZBOkVN6xwoYH7BAIOTHsPEcIu65TPPxvUZ7YFZxOXKeNaBseOEjzR8IXhhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpMSX3jmkzfRS; Thu, 01 May 2025 18:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 541I6asf066497; Thu, 1 May 2025 18:06:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541I6avV066494; Thu, 1 May 2025 18:06:36 GMT (envelope-from git) Date: Thu, 1 May 2025 18:06:36 GMT Message-Id: <202505011806.541I6avV066494@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: 5f2dd25a9e71 - main - efivar: Test uuid against zero 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 5f2dd25a9e718f8d317c249e813818edbee08b22 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5f2dd25a9e718f8d317c249e813818edbee08b22 commit 5f2dd25a9e718f8d317c249e813818edbee08b22 Author: Warner Losh AuthorDate: 2025-05-01 17:53:05 +0000 Commit: Warner Losh CommitDate: 2025-05-01 17:53:05 +0000 efivar: Test uuid against zero Test the passed in GuID against a guid of all 0's. This removes another place that has to worry about the difference between uuit_t and EFI_GUID. Sponsored by: Netflix Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50034 --- lib/libefivar/efivar.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/libefivar/efivar.c b/lib/libefivar/efivar.c index a74deeae1e03..0089ed608a6f 100644 --- a/lib/libefivar/efivar.c +++ b/lib/libefivar/efivar.c @@ -77,7 +77,6 @@ static struct uuid_table guid_tbl [] = { "f46ee6f4-4785-43a3-923d-7f786c3c8479", "lenovo_startup_interrupt", Z }, { "ffffffff-ffff-ffff-ffff-ffffffffffff", "zzignore-this-guid", Z }, }; -#undef Z static void efi_guid_tbl_compile(void) @@ -293,9 +292,7 @@ efi_guid_cmp(const efi_guid_t *guid1, const efi_guid_t *guid2) int efi_guid_is_zero(const efi_guid_t *guid) { - uint32_t status; - - return uuid_is_nil((const uuid_t *)guid, &status); + return (memcmp(guid, &efi_guid_empty, sizeof(*guid)) == 0); } int