From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c3mkM-0000Aq-DH for qemu-devel@nongnu.org; Mon, 07 Nov 2016 11:26:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c3mkH-0006AF-D1 for qemu-devel@nongnu.org; Mon, 07 Nov 2016 11:26:10 -0500 Received: from prv-mh.provo.novell.com ([137.65.248.74]:42737) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c3mkH-00069p-0e for qemu-devel@nongnu.org; Mon, 07 Nov 2016 11:26:05 -0500 Message-Id: <58211B8102000062000AE074@prv-mh.provo.novell.com> Date: Mon, 07 Nov 2016 09:25:37 -0700 From: "Lin Ma" References: <20160906082833.25428-1-lma@suse.com> In-Reply-To: <20160906082833.25428-1-lma@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] =?utf-8?b?562U5aSN77yaICBbUEFUQ0hdIHNtYmlvczogQWRk?= =?utf-8?q?_1_terminator_if_there_is_any_string_field_defined_in_given_tab?= =?utf-8?b?bGUu?= List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com Ping. >>> Lin Ma 2016/9/6 =E6=98=9F=E6=9C=9F=E4=BA=8C =E4=B8=8B=E5= =8D=88 4:28 >>> If user specifies binary file on command line to load smbios entries, then will get error messages while decoding them in guest. Reproducer: 1. dump a smbios table to a binary file from host or guest.(says table 1) 2. load the binary file through command line: 'qemu -smbios file=3D...'. 3. perform 'dmidecode' or 'dmidecode -t 1' in guest. It reports 'Invalid entry length...' because qemu doesn't add terminator(s)= for the table correctly. For smbios tables which have string field provided, qemu should add 1 = terminator. For smbios tables which dont have string field provided, qemu should add = 2. This patch fixed the issue. Signed-off-by: Lin Ma --- hw/smbios/smbios.c | 90 +++++++++++++++++++++++++++++++++++++= +++++++++ include/hw/smbios/smbios.h | 44 +++++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 74c7102..6293bc5 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -885,6 +885,9 @@ void smbios_entry_add(QemuOpts *opts) { const char *val; + int i, terminator_count =3D 2, table_str_field_count =3D 0; + int *tables_str_field_offset =3D NULL; + assert(!smbios_immutable); val =3D qemu_opt_get(opts, "file"); @@ -926,7 +929,94 @@ void smbios_entry_add(QemuOpts *opts) smbios_type4_count++; } + switch (header->type) { + case 0: + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ + = TYPE_0_STR_FIELD_COUNT); + tables_str_field_offset =3D (int []){\ + = TYPE_0_STR_FIELD_OFFSET_VENDOR, \ + = TYPE_0_STR_FIELD_OFFSET_BIOS_VERSION, \ + = TYPE_0_STR_FIELD_OFFSET_BIOS_RELEASE_DATE}; + table_str_field_count =3D sizeof(tables_str_field_offse= t) / \ + = sizeof(tables_str_field_offset[0]); + break; + case 1: + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ + = TYPE_1_STR_FIELD_COUNT); + tables_str_field_offset =3D (int []){ + = TYPE_1_STR_FIELD_OFFSET_MANUFACTURER, \ + = TYPE_1_STR_FIELD_OFFSET_PRODUCT, \ + = TYPE_1_STR_FIELD_OFFSET_VERSION, \ + = TYPE_1_STR_FIELD_OFFSET_SERIAL, \ + = TYPE_1_STR_FIELD_OFFSET_SKU, \ + = TYPE_1_STR_FIELD_OFFSET_FAMILY}; + table_str_field_count =3D sizeof(tables_str_field_offse= t) / \ + = sizeof(tables_str_field_offset[0]); + break; + case 2: + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ + = TYPE_2_STR_FIELD_COUNT); + tables_str_field_offset =3D (int []){\ + = TYPE_2_STR_FIELD_OFFSET_MANUFACTURER, \ + = TYPE_2_STR_FIELD_OFFSET_PRODUCT, \ + = TYPE_2_STR_FIELD_OFFSET_VERSION, \ + = TYPE_2_STR_FIELD_OFFSET_SERIAL, \ + = TYPE_2_STR_FIELD_OFFSET_ASSET, \ + = TYPE_2_STR_FIELD_OFFSET_LOCATION}; + table_str_field_count =3D sizeof(tables_str_field_offse= t) / \ + = sizeof(tables_str_field_offset[0]); + break; + case 3: + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ + = TYPE_3_STR_FIELD_COUNT); + tables_str_field_offset =3D (int []){\ + = TYPE_3_STR_FIELD_OFFSET_MANUFACTURER, \ + = TYPE_3_STR_FIELD_OFFSET_VERSION, \ + = TYPE_3_STR_FIELD_OFFSET_SERIAL, \ + = TYPE_3_STR_FIELD_OFFSET_ASSET, \ + = TYPE_3_STR_FIELD_OFFSET_SKU}; + table_str_field_count =3D sizeof(tables_str_field_offse= t) / \ + = sizeof(tables_str_field_offset[0]); + break; + case 4: + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ + = TYPE_4_STR_FIELD_COUNT); + tables_str_field_offset =3D (int []){\ + = TYPE_4_STR_FIELD_OFFSET_SOCKET, \ + = TYPE_4_STR_FIELD_OFFSET_PROCESSOR_MANUFACTURER, \ + = TYPE_4_STR_FIELD_OFFSET_PROCESSOR_VERSION, \ + = TYPE_4_STR_FIELD_OFFSET_SERIAL, \ + = TYPE_4_STR_FIELD_OFFSET_ASSET, \ + TYPE_4_STR_FIELD_OFFSET_PART}; + table_str_field_count =3D sizeof(tables_str_field_offse= t) / \ + = sizeof(tables_str_field_offset[0]); + break; + case 17: + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ + = TYPE_17_STR_FIELD_COUNT); + tables_str_field_offset =3D (int []){\ + = TYPE_17_STR_FIELD_OFFSET_DEVICE_LOCATOR, \ + = TYPE_17_STR_FIELD_OFFSET_BANK_LOCATOR, \ + = TYPE_17_STR_FIELD_OFFSET_MANUFACTURER, \ + = TYPE_17_STR_FIELD_OFFSET_SERIAL, \ + = TYPE_17_STR_FIELD_OFFSET_ASSET, \ + = TYPE_17_STR_FIELD_OFFSET_PART}; + table_str_field_count =3D sizeof(tables_str_field_offse= t) / \ + = sizeof(tables_str_field_offset[0]); + break; + default: + break; + } + + for (i =3D 0; i < table_str_field_count; i++) { + if (*(uint8_t *)(smbios_tables + tables_str_field_offse= t[i]) > 0) { + terminator_count =3D 1; + break; + } + } + smbios_tables_len +=3D size; + smbios_tables_len +=3D terminator_count; if (size > smbios_table_max) { smbios_table_max =3D size; } diff --git a/include/hw/smbios/smbios.h b/include/hw/smbios/smbios.h index 1cd53cc..6d59c3d 100644 --- a/include/hw/smbios/smbios.h +++ b/include/hw/smbios/smbios.h @@ -267,4 +267,48 @@ void smbios_get_tables(const struct smbios_phys_mem_ar= ea *mem_array, const unsigned int mem_array_si= ze, uint8_t **tables, size_t = *tables_len, uint8_t **anchor, size_t = *anchor_len); + +#define TYPE_0_STR_FIELD_OFFSET_VENDOR 0x4 +#define TYPE_0_STR_FIELD_OFFSET_BIOS_VERSION 0x5 +#define TYPE_0_STR_FIELD_OFFSET_BIOS_RELEASE_DATE 0x8 +#define TYPE_0_STR_FIELD_COUNT 3 + +#define TYPE_1_STR_FIELD_OFFSET_MANUFACTURER 0x4 +#define TYPE_1_STR_FIELD_OFFSET_PRODUCT 0x5 +#define TYPE_1_STR_FIELD_OFFSET_VERSION 0x6 +#define TYPE_1_STR_FIELD_OFFSET_SERIAL 0x7 +#define TYPE_1_STR_FIELD_OFFSET_SKU 0x19 +#define TYPE_1_STR_FIELD_OFFSET_FAMILY 0x1a +#define TYPE_1_STR_FIELD_COUNT 6 + +#define TYPE_2_STR_FIELD_OFFSET_MANUFACTURER 0x4 +#define TYPE_2_STR_FIELD_OFFSET_PRODUCT 0x5 +#define TYPE_2_STR_FIELD_OFFSET_VERSION 0x6 +#define TYPE_2_STR_FIELD_OFFSET_SERIAL 0x7 +#define TYPE_2_STR_FIELD_OFFSET_ASSET 0x8 +#define TYPE_2_STR_FIELD_OFFSET_LOCATION 0xa +#define TYPE_2_STR_FIELD_COUNT 6 + +#define TYPE_3_STR_FIELD_OFFSET_MANUFACTURER 0x4 +#define TYPE_3_STR_FIELD_OFFSET_VERSION 0x6 +#define TYPE_3_STR_FIELD_OFFSET_SERIAL 0x7 +#define TYPE_3_STR_FIELD_OFFSET_ASSET 0x8 +#define TYPE_3_STR_FIELD_OFFSET_SKU 0x14 +#define TYPE_3_STR_FIELD_COUNT 5 + +#define TYPE_4_STR_FIELD_OFFSET_SOCKET 0x4 +#define TYPE_4_STR_FIELD_OFFSET_PROCESSOR_MANUFACTURER 0x7 +#define TYPE_4_STR_FIELD_OFFSET_PROCESSOR_VERSION 0x10 +#define TYPE_4_STR_FIELD_OFFSET_SERIAL 0x20 +#define TYPE_4_STR_FIELD_OFFSET_ASSET 0x21 +#define TYPE_4_STR_FIELD_OFFSET_PART 0x22 +#define TYPE_4_STR_FIELD_COUNT 6 + +#define TYPE_17_STR_FIELD_OFFSET_DEVICE_LOCATOR 0x10 +#define TYPE_17_STR_FIELD_OFFSET_BANK_LOCATOR 0x11 +#define TYPE_17_STR_FIELD_OFFSET_MANUFACTURER 0x17 +#define TYPE_17_STR_FIELD_OFFSET_SERIAL 0x18 +#define TYPE_17_STR_FIELD_OFFSET_ASSET 0x19 +#define TYPE_17_STR_FIELD_OFFSET_PART 0x1a +#define TYPE_17_STR_FIELD_COUNT 6 #endif /* QEMU_SMBIOS_H */ --=20 2.9.2