|
 |
432cb7 |
From 4e8fb957a349558648d5cddb80a89460bc97439e Mon Sep 17 00:00:00 2001
|
|
|
432cb7 |
From: Jon Maloy <jmaloy@redhat.com>
|
|
|
432cb7 |
Date: Wed, 30 Mar 2022 14:52:34 -0400
|
|
|
432cb7 |
Subject: [PATCH 09/18] acpi: fix QEMU crash when started with SLIC table
|
|
|
432cb7 |
MIME-Version: 1.0
|
|
|
432cb7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
432cb7 |
Content-Transfer-Encoding: 8bit
|
|
|
432cb7 |
|
|
|
432cb7 |
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
|
432cb7 |
RH-MergeRequest: 141: acpi: fix QEMU crash when started with SLIC table
|
|
|
432cb7 |
RH-Commit: [1/10] 0c34e80346c33da4f220d9c486b120c35005144e (jmaloy/qemu-kvm)
|
|
|
432cb7 |
RH-Bugzilla: 2062611
|
|
|
432cb7 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
432cb7 |
|
|
|
432cb7 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2062611
|
|
|
432cb7 |
Upstream: Merged
|
|
|
432cb7 |
|
|
|
432cb7 |
commit 8cdb99af45365727ac17f45239a9b8c1d5155c6d)
|
|
|
432cb7 |
Author: Igor Mammedov <imammedo@redhat.com>
|
|
|
432cb7 |
Date: Mon Dec 27 14:31:17 2021 -0500
|
|
|
432cb7 |
|
|
|
432cb7 |
acpi: fix QEMU crash when started with SLIC table
|
|
|
432cb7 |
|
|
|
432cb7 |
if QEMU is started with used provided SLIC table blob,
|
|
|
432cb7 |
|
|
|
432cb7 |
-acpitable sig=SLIC,oem_id='CRASH ',oem_table_id="ME",oem_rev=00002210,asl_compiler_id="",asl_compiler_rev=00000000,data=/dev/null
|
|
|
432cb7 |
it will assert with:
|
|
|
432cb7 |
|
|
|
432cb7 |
hw/acpi/aml-build.c:61:build_append_padded_str: assertion failed: (len <= maxlen)
|
|
|
432cb7 |
|
|
|
432cb7 |
and following backtrace:
|
|
|
432cb7 |
|
|
|
432cb7 |
...
|
|
|
432cb7 |
build_append_padded_str (array=0x555556afe320, str=0x555556afdb2e "CRASH ME", maxlen=0x6, pad=0x20) at hw/acpi/aml-build.c:61
|
|
|
432cb7 |
acpi_table_begin (desc=0x7fffffffd1b0, array=0x555556afe320) at hw/acpi/aml-build.c:1727
|
|
|
432cb7 |
build_fadt (tbl=0x555556afe320, linker=0x555557ca3830, f=0x7fffffffd318, oem_id=0x555556afdb2e "CRASH ME", oem_table_id=0x555556afdb34 "ME") at hw/acpi/aml-build.c:2064
|
|
|
432cb7 |
...
|
|
|
432cb7 |
|
|
|
432cb7 |
which happens due to acpi_table_begin() expecting NULL terminated
|
|
|
432cb7 |
oem_id and oem_table_id strings, which is normally the case, but
|
|
|
432cb7 |
in case of user provided SLIC table, oem_id points to table's blob
|
|
|
432cb7 |
directly and as result oem_id became longer than expected.
|
|
|
432cb7 |
|
|
|
432cb7 |
Fix issue by handling oem_id consistently and make acpi_get_slic_oem()
|
|
|
432cb7 |
return NULL terminated strings.
|
|
|
432cb7 |
|
|
|
432cb7 |
PS:
|
|
|
432cb7 |
After [1] refactoring, oem_id semantics became inconsistent, where
|
|
|
432cb7 |
NULL terminated string was coming from machine and old way pointer
|
|
|
432cb7 |
into byte array coming from -acpitable option. That used to work
|
|
|
432cb7 |
since build_header() wasn't expecting NULL terminated string and
|
|
|
432cb7 |
blindly copied the 1st 6 bytes only.
|
|
|
432cb7 |
|
|
|
432cb7 |
However commit [2] broke that by replacing build_header() with
|
|
|
432cb7 |
acpi_table_begin(), which was expecting NULL terminated string
|
|
|
432cb7 |
and was checking oem_id size.
|
|
|
432cb7 |
|
|
|
432cb7 |
1) 602b45820 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
|
|
|
432cb7 |
2)
|
|
|
432cb7 |
Fixes: 4b56e1e4eb08 ("acpi: build_fadt: use acpi_table_begin()/acpi_table_end() instead of build_header()")
|
|
|
432cb7 |
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/786
|
|
|
432cb7 |
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
432cb7 |
Message-Id: <20211227193120.1084176-2-imammedo@redhat.com>
|
|
|
432cb7 |
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
432cb7 |
Tested-by: Denis Lisov <dennis.lissov@gmail.com>
|
|
|
432cb7 |
Tested-by: Alexander Tsoy <alexander@tsoy.me>
|
|
|
432cb7 |
Cc: qemu-stable@nongnu.org
|
|
|
432cb7 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
432cb7 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
432cb7 |
|
|
|
432cb7 |
(cherry picked from commit 8cdb99af45365727ac17f45239a9b8c1d5155c6d)
|
|
|
432cb7 |
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
|
432cb7 |
---
|
|
|
432cb7 |
hw/acpi/core.c | 4 ++--
|
|
|
432cb7 |
hw/i386/acpi-build.c | 2 ++
|
|
|
432cb7 |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
432cb7 |
|
|
|
432cb7 |
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
|
|
|
432cb7 |
index 1e004d0078..3e811bf03c 100644
|
|
|
432cb7 |
--- a/hw/acpi/core.c
|
|
|
432cb7 |
+++ b/hw/acpi/core.c
|
|
|
432cb7 |
@@ -345,8 +345,8 @@ int acpi_get_slic_oem(AcpiSlicOem *oem)
|
|
|
432cb7 |
struct acpi_table_header *hdr = (void *)(u - sizeof(hdr->_length));
|
|
|
432cb7 |
|
|
|
432cb7 |
if (memcmp(hdr->sig, "SLIC", 4) == 0) {
|
|
|
432cb7 |
- oem->id = hdr->oem_id;
|
|
|
432cb7 |
- oem->table_id = hdr->oem_table_id;
|
|
|
432cb7 |
+ oem->id = g_strndup(hdr->oem_id, 6);
|
|
|
432cb7 |
+ oem->table_id = g_strndup(hdr->oem_table_id, 8);
|
|
|
432cb7 |
return 0;
|
|
|
432cb7 |
}
|
|
|
432cb7 |
}
|
|
|
432cb7 |
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
|
|
|
432cb7 |
index a4478e77b7..acc4869db0 100644
|
|
|
432cb7 |
--- a/hw/i386/acpi-build.c
|
|
|
432cb7 |
+++ b/hw/i386/acpi-build.c
|
|
|
432cb7 |
@@ -2726,6 +2726,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
|
|
|
432cb7 |
|
|
|
432cb7 |
/* Cleanup memory that's no longer used. */
|
|
|
432cb7 |
g_array_free(table_offsets, true);
|
|
|
432cb7 |
+ g_free(slic_oem.id);
|
|
|
432cb7 |
+ g_free(slic_oem.table_id);
|
|
|
432cb7 |
}
|
|
|
432cb7 |
|
|
|
432cb7 |
static void acpi_ram_update(MemoryRegion *mr, GArray *data)
|
|
|
432cb7 |
--
|
|
|
432cb7 |
2.27.0
|
|
|
432cb7 |
|