From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <ani@anisinha.ca>,
qemu-stable@nongnu.org, Marian Postevca <posteuca@mutex.one>,
"Dmitry V . Orekhov" <dima.orekhov@gmail.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Subject: [PATCH 3/4] acpi: fix OEM ID/OEM Table ID padding
Date: Wed, 12 Jan 2022 08:03:31 -0500 [thread overview]
Message-ID: <20220112130332.1648664-4-imammedo@redhat.com> (raw)
In-Reply-To: <20220112130332.1648664-1-imammedo@redhat.com>
Commit [2] broke original '\0' padding of OEM ID and OEM Table ID
fields in headers of ACPI tables. While it doesn't have impact on
default values since QEMU uses 6 and 8 characters long values
respectively, it broke usecase where IDs are provided on QEMU CLI.
It shouldn't affect guest (but may cause licensing verification
issues in guest OS).
One of the broken usecases is user supplied SLIC table with IDs
shorter than max possible length, where [2] mangles IDs with extra
spaces in RSDT and FADT tables whereas guest OS expects those to
mirror the respective values of the used SLIC table.
Fix it by replacing whitespace padding with '\0' padding in
accordance with [1] and expectations of guest OS
1) ACPI spec, v2.0b
17.2 AML Grammar Definition
...
//OEM ID of up to 6 characters. If the OEM ID is
//shorter than 6 characters, it can be terminated
//with a NULL character.
2)
Fixes: 602b458201 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/707
Reported-by: Dmitry V. Orekhov <dima.orekhov@gmail.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Cc: qemu-stable@nongnu.org
---
hw/acpi/aml-build.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index b3b3310df3..65148d5b9d 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1724,9 +1724,9 @@ void acpi_table_begin(AcpiTable *desc, GArray *array)
build_append_int_noprefix(array, 0, 4); /* Length */
build_append_int_noprefix(array, desc->rev, 1); /* Revision */
build_append_int_noprefix(array, 0, 1); /* Checksum */
- build_append_padded_str(array, desc->oem_id, 6, ' '); /* OEMID */
+ build_append_padded_str(array, desc->oem_id, 6, '\0'); /* OEMID */
/* OEM Table ID */
- build_append_padded_str(array, desc->oem_table_id, 8, ' ');
+ build_append_padded_str(array, desc->oem_table_id, 8, '\0');
build_append_int_noprefix(array, 1, 4); /* OEM Revision */
g_array_append_vals(array, ACPI_BUILD_APPNAME8, 4); /* Creator ID */
build_append_int_noprefix(array, 1, 4); /* Creator Revision */
--
2.31.1
next prev parent reply other threads:[~2022-01-12 14:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 13:03 [PATCH 0/4] acpi: fix short OEM [Table] ID padding Igor Mammedov
2022-01-12 13:03 ` [PATCH 1/4] tests: acpi: manually pad OEM_ID/OEM_TABLE_ID for test_oem_fields() test Igor Mammedov
2022-01-12 13:44 ` Michael S. Tsirkin
2022-01-14 11:48 ` Igor Mammedov
2022-01-14 13:09 ` Michael S. Tsirkin
2022-01-12 13:03 ` [PATCH 2/4] tests: acpi: whitelist nvdimm's SSDT and FACP.slic expected blobs Igor Mammedov
2022-01-12 13:03 ` Igor Mammedov [this message]
2022-01-12 13:39 ` [PATCH 3/4] acpi: fix OEM ID/OEM Table ID padding Michael S. Tsirkin
2022-01-12 15:16 ` Ani Sinha
2022-01-12 15:28 ` Michael S. Tsirkin
2022-01-12 15:19 ` Ani Sinha
2022-01-13 9:53 ` Dmitry V. Orekhov
2022-01-13 10:22 ` Ani Sinha
2022-01-13 13:19 ` Dmitry V. Orekhov
2022-01-31 6:17 ` Ani Sinha
2022-01-31 13:20 ` Igor Mammedov
2022-01-31 13:28 ` Ani Sinha
2022-01-31 14:10 ` Igor Mammedov
2022-01-31 14:21 ` Ani Sinha
2022-02-01 7:39 ` Igor Mammedov
2022-02-01 7:55 ` Ani Sinha
2022-02-01 9:14 ` Igor Mammedov
2022-01-12 13:03 ` [PATCH 4/4] tests: acpi: update expected blobs Igor Mammedov
2022-01-12 15:13 ` Ani Sinha
2022-01-14 14:26 ` [PATCH 5/4] tests: acpi: test short OEM_ID/OEM_TABLE_ID values in test_oem_fields() Igor Mammedov
2022-01-14 14:53 ` Ani Sinha
2022-01-31 13:21 ` [PATCH 0/4] acpi: fix short OEM [Table] ID padding Igor Mammedov
2022-01-31 13:37 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220112130332.1648664-4-imammedo@redhat.com \
--to=imammedo@redhat.com \
--cc=ani@anisinha.ca \
--cc=dima.orekhov@gmail.com \
--cc=mst@redhat.com \
--cc=posteuca@mutex.one \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).