From nobody Thu May 1 18:06:37 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 4ZpMSZ6pQ3z5vWgQ; Thu, 01 May 2025 18:06:38 +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 4ZpMSY57zBz4BK1; Thu, 01 May 2025 18:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746122797; 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=KCC9YroUsoTcmVBnsnfp4gbPlfsctGaZ10PvQcvbC/4=; b=tvX0TRse4vp+OYHzig2zkXKydym5BDHwmTFE0qzayhi9Cmuz2y8zxiDOyYq26nSOlSTFf2 ySoldp+05p9eEe6aTfVddNwxCJKHT2ep6n9TOvyaRfJM2TOFiRW7RMhTV2xgq3PnUoE8AQ Wc8qGVNYj0P/3kTvIVOnEYaNfQA+JRHpuqC9xpGiTrV9vtEQfJd/tMPTBgjQr9nfcz4GM9 cr1L3KVI2YOH3hwIrcrwyoL9njITOEpVRlhpZZo2pnNSF3i6oDV5gwC/BfjB36C9ez3R7f D7uTV527aGd2s5TZ+/a8GdvKKX3ZX1kiCwioD9jLOiE7l9QRgdPqyTjUpjvn6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746122797; 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=KCC9YroUsoTcmVBnsnfp4gbPlfsctGaZ10PvQcvbC/4=; b=DiCV+ZDk+4DHydDubEu1nh6G2bHnhwLVooDVnyBPntvaBqTkjIg8MJPoNIWUswjS6GrIqK vGU5jGKNC9svT1aeAdTJnODPIQAfXkTh0aobY5H3BksGyP7poD1tfi0TIjwno1VYkwipa6 i08oJD3olHpOImr1AbzjC4JhWagSg/JOPC2XwL0k0Ci2Vs7FQRbzE3gkTR90wJBnj+m/Wf bMcjYT8x1lDEc4q9E94s0jIb4873NzI5f2yrBQMnKzcnnnErbZuOfCChxDAJHRT8VT96k/ oXPDWofpEMndhXKnt4AcKI1BKmXrRa9gByFwJkYRHZfTa24mwTeQwPFPwTO24g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746122797; a=rsa-sha256; cv=none; b=sidL7qbKUkYfCKGLKARrcXlJzkyf4jzO+/f6+BiA8sUdrfTjaNX839m3Dk9fOj8juC7R5n s9kVnx/FbUq7VsF5srM+aRcVWJO6eWwyostyohgwPZRz6F/CRzbhTuvI4yNOfRHwWs4+uc nw4EbOw6qc/3jnCWpVHLamBeX2t3X7aymm161tT4mIKhY3uR5ZRaQ/ZsJob1aBSvnuLDNb I3Igfw+6iNv9oiGCuUb0v092FWk9RiuXIwnIRXqfLw806w9QU4zc7YhrIXuVhj09NDdWA8 4tcni/rK0uiZrNE5+FNjxfaDBcJzfY+lm+Y31cVluc7qu53fRAddjc0m+GbApw== 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 4ZpMSY4cWVzfPZ; Thu, 01 May 2025 18:06:37 +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 541I6bii066535; Thu, 1 May 2025 18:06:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541I6bXG066532; Thu, 1 May 2025 18:06:37 GMT (envelope-from git) Date: Thu, 1 May 2025 18:06:37 GMT Message-Id: <202505011806.541I6bXG066532@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: 20c5e4b39368 - main - efivar: Allow uuid_t and efi_guid_t to be different types. 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: 20c5e4b393682b00694a1ef184ec4bd460b49ab1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=20c5e4b393682b00694a1ef184ec4bd460b49ab1 commit 20c5e4b393682b00694a1ef184ec4bd460b49ab1 Author: Warner Losh AuthorDate: 2025-05-01 17:53:12 +0000 Commit: Warner Losh CommitDate: 2025-05-01 17:53:12 +0000 efivar: Allow uuid_t and efi_guid_t to be different types. While they are binarily the same, the API are different. To use EDK2 more effectively, we need to transition to using EDK@'s API rather than the uuid_t API. This change makes the code neutral on the subject. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D50035 --- lib/libefivar/efivar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libefivar/efivar.c b/lib/libefivar/efivar.c index 0089ed608a6f..e28987ff001d 100644 --- a/lib/libefivar/efivar.c +++ b/lib/libefivar/efivar.c @@ -172,7 +172,7 @@ efi_get_variable(efi_guid_t guid, const char *name, rv = utf8_to_ucs2(name, &var.name, &var.namesize); if (rv != 0) goto errout; - var.vendor = guid; + memcpy(&var.vendor, &guid, sizeof(guid)); var.data = buf; var.datasize = sizeof(buf); rv = ioctl(efi_fd, EFIIOC_VAR_GET, &var); @@ -240,7 +240,7 @@ again: rv = utf8_to_ucs2(*name, &var.name, &size); if (rv != 0) goto errout; - var.vendor = **guid; + memcpy(&var.vendor, *guid, sizeof(**guid)); } rv = ioctl(efi_fd, EFIIOC_VAR_NEXT, &var); if (rv == 0 && var.name == NULL) { @@ -266,7 +266,7 @@ again: rv = ucs2_to_utf8(var.name, name); if (rv != 0) goto errout; - retguid = var.vendor; + memcpy(&retguid, &var.vendor, sizeof(retguid)); *guid = &retguid; } errout: @@ -361,7 +361,7 @@ efi_set_variable(efi_guid_t guid, const char *name, rv = utf8_to_ucs2(name, &var.name, &var.namesize); if (rv != 0) goto errout; - var.vendor = guid; + memcpy(&var.vendor, &guid, sizeof(guid)); var.data = data; var.datasize = data_size; var.attrib = attributes;