From nobody Tue Oct 15 11:13:59 2024 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 4XSWgq2rGtz5Ymhb; Tue, 15 Oct 2024 11:13:59 +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 4XSWgq29QKz4Z7N; Tue, 15 Oct 2024 11:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728990839; 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=Uce91dpUhaxLmK4VmHePvqpruyTd2N+yE7+cVXJKFdI=; b=F+JMdf4JSLVn1lZO2ssvsT1a0/kWEDy3kWP0lYWpRLn+cELu/4AYgtoeYgQy6/Zus+IKJ4 hCHYfLMDN/Zdc0C9qMJftM5S5+t4QWDchk133tdeIa1j10Qf1YgOtwnQiNIFk1LEJLjHYt B1N3laDug84XfVoiYXj8Mf5rEZ0gD3x5mChEU7nC4y8a5xioKuTLmejO1HYbNyCXg0g1W7 Ut9N8sVJZL3dkzNynm6oTLBqCifDf+XBl6PLZOd2cZojiCpDn2XghYaxxtgNEOj4wWGmAL LJjbQwc8u6bPJjHTmSJNzdyCtDT0JKvifydQ7UJY6jCcj6yYyfHZQhRdiIP3rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728990839; 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=Uce91dpUhaxLmK4VmHePvqpruyTd2N+yE7+cVXJKFdI=; b=JRWJlCK2JCrvepGWH4GN9vnIDlhb16EcT9uUP0mxlfojw+taEcyXBsCzIpYcZap4awarAX uOjCgH933pky4BbmHU2X4yrsUUr3DETLfXjFCz0sXIW9I81RwTLziL88sLRhDYT+knDGaY fIdg1I7TYT+KPzzUOsRNMaR4wtVbLWkpqorbklvpZU87fUmYXxctYciGp1ujVw3JC0P0i2 nf89bb82/MSuL9G6R4I4H87UF6u3k6eXZwmsEXPNpCkcHFJ4MohIRVfYhYXfRGgKfkoPqX qjVhB2cdWhCj9+rn/YgVA0fBHe2IAdL+nDaiFGbbC7isKnUhlBhz+a9gnH8WlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728990839; a=rsa-sha256; cv=none; b=g8jiqY1Eer8bvvzH0uNn6mDQgfydke38E0c44wPyA7vUbPWmQ31Qg3/+647wrHczEmvIUG zgc3c2OROhci9RvJGWsQtkHvoVF0ZkDNPl/i4kD4EZEBK9HE8w3SfhsibrX/k2fbwJVxkQ pzkqFzBvUGbG4ApCwq1xTjbEYEyd7mW3Pp4CKt/5lsWJkNTbKALWWqbmPQuYHq8qAV/1B2 DKzcmuBKo24laKpjSCiiyM7tK/Tmi2KBVrYQIpfwCOTmOQEZmYQwMLIwSDm54K5Z7H2WbP Oc7k0/PxJ97WfbgcbFN/YXeKIfr98j5YGWVIVeP5gge6IUsLQo6FKsi5IThA/A== 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 4XSWgq1ngVzKRx; Tue, 15 Oct 2024 11:13:59 +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 49FBDx5I097762; Tue, 15 Oct 2024 11:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49FBDxpO097759; Tue, 15 Oct 2024 11:13:59 GMT (envelope-from git) Date: Tue, 15 Oct 2024 11:13:59 GMT Message-Id: <202410151113.49FBDxpO097759@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: 19dd881177fc - main - acpidump: Use ACPI_NAMESEG_SIZE instead of 4 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: 19dd881177fcd38c63c26bc4b2d1328311fefec8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=19dd881177fcd38c63c26bc4b2d1328311fefec8 commit 19dd881177fcd38c63c26bc4b2d1328311fefec8 Author: Warner Losh AuthorDate: 2024-10-15 11:07:30 +0000 Commit: Warner Losh CommitDate: 2024-10-15 11:07:30 +0000 acpidump: Use ACPI_NAMESEG_SIZE instead of 4 In a couple of places, we use 4 instead of ACPI_NAMESEG_SIZE. Use the Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D47109 --- usr.sbin/acpi/acpidump/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 4eb361a6f479..746db4a5583c 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -2631,13 +2631,13 @@ sdt_load_devmem(void) acpi_print_rsd_ptr(rp); if (rp->Revision < 2) { rsdp = (ACPI_TABLE_HEADER *)acpi_map_sdt(rp->RsdtPhysicalAddress); - if (memcmp(rsdp->Signature, "RSDT", 4) != 0 || + if (memcmp(rsdp->Signature, "RSDT", ACPI_NAMESEG_SIZE) != 0 || acpi_checksum(rsdp, rsdp->Length) != 0) errx(1, "RSDT is corrupted"); addr_size = sizeof(uint32_t); } else { rsdp = (ACPI_TABLE_HEADER *)acpi_map_sdt(rp->XsdtPhysicalAddress); - if (memcmp(rsdp->Signature, "XSDT", 4) != 0 || + if (memcmp(rsdp->Signature, "XSDT", ACPI_NAMESEG_SIZE) != 0 || acpi_checksum(rsdp, rsdp->Length) != 0) errx(1, "XSDT is corrupted"); addr_size = sizeof(uint64_t);