From mboxrd@z Thu Jan 1 00:00:00 1970 From: Beth Kon Subject: [PATCH 2/2] Clean up RSDT Table Creation (v2) Date: Tue, 9 Jun 2009 11:55:23 -0400 Message-ID: <1244562923-4336-2-git-send-email-eak@us.ibm.com> References: <1244562923-4336-1-git-send-email-eak@us.ibm.com> Cc: kvm@vger.kernel.org, Beth Kon To: avi@redhat.com Return-path: Received: from e39.co.us.ibm.com ([32.97.110.160]:42716 "EHLO e39.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753242AbZFIPyn (ORCPT ); Tue, 9 Jun 2009 11:54:43 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e39.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n59FojsU026857 for ; Tue, 9 Jun 2009 09:50:45 -0600 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n59FsaJA176342 for ; Tue, 9 Jun 2009 09:54:36 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n59FsZfF010744 for ; Tue, 9 Jun 2009 09:54:35 -0600 In-Reply-To: <1244562923-4336-1-git-send-email-eak@us.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: This patch is also based on the patch by Vincent Minet. It corrects the size calculation of the RSDT, and checks for overflow of MAX_RSDT_ENTRIES, assuming that the external table entry count is contained within MAX_RSDT_ENTRIES. I moved the for() loop to the end of the code that adds table_offset_entry entries so I could add the check for overflow - || (nb_rsdt_entries > MAX_RSDT_ENTRIES) This is not ideal. An ideal fix would require a rewrite of the rsdt build code, which I can do later and submit to qemu. Signed-off-by: Beth Kon diff --git a/kvm/bios/rombios32.c b/kvm/bios/rombios32.c index cdae363..7db91d8 100755 --- a/kvm/bios/rombios32.c +++ b/kvm/bios/rombios32.c @@ -1602,7 +1602,7 @@ void acpi_bios_init(void) uint32_t hpet_addr; #endif uint32_t base_addr, rsdt_addr, fadt_addr, addr, facs_addr, dsdt_addr, ssdt_addr; - uint32_t acpi_tables_size, madt_addr, madt_size, rsdt_size, madt_end; + uint32_t acpi_tables_size, madt_addr, madt_size, rsdt_size, madt_end, rsdt_end; uint32_t srat_addr,srat_size; uint16_t i, external_tables; int nb_numa_nodes; @@ -1628,7 +1628,7 @@ void acpi_bios_init(void) addr = base_addr = ram_size - ACPI_DATA_SIZE; rsdt_addr = addr; rsdt = (void *)(addr); - rsdt_size = sizeof(*rsdt) + external_tables * 4; + rsdt_size = sizeof(*rsdt); addr += rsdt_size; fadt_addr = addr; @@ -1872,16 +1872,6 @@ void acpi_bios_init(void) "HPET", sizeof(*hpet), 1); #endif - acpi_additional_tables(); /* resets cfg to required entry */ - for(i = 0; i < external_tables; i++) { - uint16_t len; - if(acpi_load_table(i, addr, &len) < 0) - BX_PANIC("Failed to load ACPI table from QEMU\n"); - rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(addr); - addr += len; - if(addr >= ram_size) - BX_PANIC("ACPI table overflow\n"); - } #endif /* RSDT */ @@ -1894,9 +1884,19 @@ void acpi_bios_init(void) // rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(hpet_addr); if (nb_numa_nodes > 0) rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(srat_addr); + acpi_additional_tables(); /* resets cfg to required entry */ + for(i = 0; i < external_tables; i++) { + uint16_t len; + if(acpi_load_table(i, addr, &len) < 0) + BX_PANIC("Failed to load ACPI table from QEMU\n"); + rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(addr); + addr += len; + if ((addr >= ram_size) || (nb_rsdt_entries > MAX_RSDT_ENTRIES)) + BX_PANIC("ACPI table overflow\n"); + } #endif - rsdt_size -= MAX_RSDT_ENTRIES * 4; - rsdt_size += nb_rsdt_entries * 4; + rsdt_end = (uint32_t)(&rsdt->table_offset_entry[nb_rsdt_entries]); + rsdt_size = rsdt_end - rsdt_addr; acpi_build_table_header((struct acpi_table_header *)rsdt, "RSDT", rsdt_size, 1);