From nobody Fri Jun 07 10:15:25 2024 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 4VwcXG0wjgz5NFM1; Fri, 07 Jun 2024 10:15:26 +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 4VwcXF73mfz4DVk; Fri, 7 Jun 2024 10:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717755326; 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=qXaWcSVQNq3neoUk8KT6m1XHtoCPVyA/OA/qBwBWC/c=; b=mHZALTjJFurhYZkQRbcD5WCixx7UXiy+lw4kTHo9ak0Muv6UfPF3bMLRxKfZKWPEEAGIJe T/ih0QgWaSFQmIp/0YepLKWG1YvL2fA6dV4yBwski1xkfK8ntiAbXnDIZu2b/si0QVFuxi zWUXKP6vbprwwBxh5lbR7i+Qj5BfSMlqrXpCQx/lu+sP63cVcYomyqCZ/ce3gMquGgCkmF vQYkUcDvydJrL0KPKwhxPwgErI97HjhHo2EXMXKpEGKcMNkNqysl4U5NgnWHmVGJBK1LKW Gs96xk9jAsx7VM/pIzcFP81mWZ+0WvcKnX/zO2IOeSKaihrLT9s9g3woiWtd3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717755326; a=rsa-sha256; cv=none; b=c+PhNvEh9ur5YrIimVsUNcZcM+6sNWSJkfRyEY3si4OGmlQm4GUMJJyXoVentGwK1dz2HQ MYkcm9ix/6ItlcKreFcfrTiOz7I8/Df2zMG9dCGSdLQX88dkNZrlUjbOlNZ9By2snAqB92 4DMY9MLRQ73CZNNMTySxPEkrlPKa/80/zKEVD5VAS3c7TDEbfrLZ8l99Ki9QCYfD8zCqG3 HKKubpNIH0habrCKSLkoUBYZD6KdB5MK0/Y6Pa6STytzr0PpGjKQLFIiYtKzDyPDbc8hLK D9olIvADSkj/UEXJpQ6/RmH7QV9+M2m63/X8MzrHqQIrBIhhG8s5WFaKQZ1yrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717755326; 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=qXaWcSVQNq3neoUk8KT6m1XHtoCPVyA/OA/qBwBWC/c=; b=CuOHiK3SnJbfjBnQux+P3R1jJR3V7ayHdmZs/NenYAR82uVotWZlHaYHqfmOT5UmKQDvs9 +023ZrRQzuDvmHFvYgcSzHP2uC+bIjnrRZlUDpP3+5e3JfdcLEgU76hP7+Ulec6QbcxRxt 1nNPSDFdJBs/wQ4NO2KxvSdeNKrzLV8rt1Nme7pBAvjLmrDpYoSQhPZH39LbDleIf4I5ik BXNHWcfUjYBFjWQv5dpxoCC4zu92i27VgB1nsW3pQvAMmN1QG8qnAvA7EkuCSyZeikHXLG q/c2HYUQpFYk/zUkVlCRmgActSdGI5LIWJRTzNr5gyv7MlH7vqefl3GJ3LGAcQ== 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 4VwcXF6Yspz1PGn; Fri, 7 Jun 2024 10:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 457AFPbV013466; Fri, 7 Jun 2024 10:15:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 457AFPbq013463; Fri, 7 Jun 2024 10:15:25 GMT (envelope-from git) Date: Fri, 7 Jun 2024 10:15:25 GMT Message-Id: <202406071015.457AFPbq013463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 109a1b8fbf6f - stable/14 - acpidump: improve length calculation for several IVHD elements 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 109a1b8fbf6f27c5ba3d826fe638e5c4c07f4cad Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=109a1b8fbf6f27c5ba3d826fe638e5c4c07f4cad commit 109a1b8fbf6f27c5ba3d826fe638e5c4c07f4cad Author: Konstantin Belousov AuthorDate: 2024-05-30 15:21:59 +0000 Commit: Konstantin Belousov CommitDate: 2024-06-07 10:15:11 +0000 acpidump: improve length calculation for several IVHD elements (cherry picked from commit 1eb7099eaceacd4e26606b074db6633ca7e5359a) --- 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 6f8effe58fbd..7b2e0c5e4d12 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1629,8 +1629,8 @@ acpi_handle_ivrs_ivhd_devs(ACPI_IVRS_DE_HEADER *d, char *de) } else if (d->Type == ACPI_IVRS_TYPE_EXT_START) { d8b = (ACPI_IVRS_DEVICE8B *)db; len = sizeof(*d8b); - d4 = (ACPI_IVRS_DEVICE4 *)(db + sizeof(*d8a)); - len = sizeof(*d8a) + sizeof(*d4); + d4 = (ACPI_IVRS_DEVICE4 *)(db + sizeof(*d8b)); + len = sizeof(*d8b) + sizeof(*d4); printf("\t\tDev Type=%#x Id=%#06x-%#06x", d8a->Header.Type, d8a->Header.Id, d4->Header.Id); acpi_handle_ivrs_ivhd_dte(d8b->Header.DataSetting);