From patchwork Thu Jun 6 16:27:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 249477 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DE7982C008A for ; Fri, 7 Jun 2013 02:32:20 +1000 (EST) Received: from localhost ([::1]:46139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ukd6o-0005cH-UX for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2013 12:32:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ukd2F-0006SZ-Li for qemu-devel@nongnu.org; Thu, 06 Jun 2013 12:27:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ukd2B-000746-LE for qemu-devel@nongnu.org; Thu, 06 Jun 2013 12:27:35 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:41777) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ukd2B-00073g-BU for qemu-devel@nongnu.org; Thu, 06 Jun 2013 12:27:31 -0400 Received: from blackfin.pond.sub.org (p5B32B146.dip0.t-ipconnect.de [91.50.177.70]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 42D45A62D7; Thu, 6 Jun 2013 18:27:28 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D4299200B7; Thu, 6 Jun 2013 18:27:26 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2013 18:27:24 +0200 Message-Id: <1370536046-15125-6-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1370536046-15125-1-git-send-email-armbru@redhat.com> References: <1370536046-15125-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:121:10e4::3 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 5/7] smbios: Clean up smbios_add_field() parameters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Having size preceed the associated pointer is odd. Swap them, and fix up the types. Signed-off-by: Markus Armbruster --- arch_init.c | 2 +- hw/i386/smbios.c | 26 ++++++++++++++------------ include/hw/i386/smbios.h | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/arch_init.c b/arch_init.c index aa24660..06b65a2 100644 --- a/arch_init.c +++ b/arch_init.c @@ -1030,7 +1030,7 @@ int qemu_uuid_parse(const char *str, uint8_t *uuid) } #ifdef TARGET_I386 smbios_add_field(1, offsetof(struct smbios_type_1, uuid), - sizeof(uuid), uuid); + uuid, sizeof(uuid)); #endif return 0; } diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c index a67a328..322f0a0 100644 --- a/hw/i386/smbios.c +++ b/hw/i386/smbios.c @@ -99,7 +99,7 @@ static void smbios_check_collision(int type, int entry) } } -void smbios_add_field(int type, int offset, int len, void *data) +void smbios_add_field(int type, int offset, const void *data, size_t len) { struct smbios_field *field; @@ -130,21 +130,23 @@ static void smbios_build_type_0_fields(const char *t) if (get_param_value(buf, sizeof(buf), "vendor", t)) smbios_add_field(0, offsetof(struct smbios_type_0, vendor_str), - strlen(buf) + 1, buf); + buf, strlen(buf) + 1); if (get_param_value(buf, sizeof(buf), "version", t)) smbios_add_field(0, offsetof(struct smbios_type_0, bios_version_str), - strlen(buf) + 1, buf); + buf, strlen(buf) + 1); if (get_param_value(buf, sizeof(buf), "date", t)) smbios_add_field(0, offsetof(struct smbios_type_0, bios_release_date_str), - strlen(buf) + 1, buf); + buf, strlen(buf) + 1); if (get_param_value(buf, sizeof(buf), "release", t)) { int major, minor; sscanf(buf, "%d.%d", &major, &minor); smbios_add_field(0, offsetof(struct smbios_type_0, - system_bios_major_release), 1, &major); + system_bios_major_release), + &major, 1); smbios_add_field(0, offsetof(struct smbios_type_0, - system_bios_minor_release), 1, &minor); + system_bios_minor_release), + &minor, 1); } } @@ -154,16 +156,16 @@ static void smbios_build_type_1_fields(const char *t) if (get_param_value(buf, sizeof(buf), "manufacturer", t)) smbios_add_field(1, offsetof(struct smbios_type_1, manufacturer_str), - strlen(buf) + 1, buf); + buf, strlen(buf) + 1); if (get_param_value(buf, sizeof(buf), "product", t)) smbios_add_field(1, offsetof(struct smbios_type_1, product_name_str), - strlen(buf) + 1, buf); + buf, strlen(buf) + 1); if (get_param_value(buf, sizeof(buf), "version", t)) smbios_add_field(1, offsetof(struct smbios_type_1, version_str), - strlen(buf) + 1, buf); + buf, strlen(buf) + 1); if (get_param_value(buf, sizeof(buf), "serial", t)) smbios_add_field(1, offsetof(struct smbios_type_1, serial_number_str), - strlen(buf) + 1, buf); + buf, strlen(buf) + 1); if (get_param_value(buf, sizeof(buf), "uuid", t)) { if (qemu_uuid_parse(buf, qemu_uuid) != 0) { error_report("Invalid UUID"); @@ -172,10 +174,10 @@ static void smbios_build_type_1_fields(const char *t) } if (get_param_value(buf, sizeof(buf), "sku", t)) smbios_add_field(1, offsetof(struct smbios_type_1, sku_number_str), - strlen(buf) + 1, buf); + buf, strlen(buf) + 1); if (get_param_value(buf, sizeof(buf), "family", t)) smbios_add_field(1, offsetof(struct smbios_type_1, family_str), - strlen(buf) + 1, buf); + buf, strlen(buf) + 1); } int smbios_entry_add(const char *t) diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h index 94e3641..9babeaf 100644 --- a/include/hw/i386/smbios.h +++ b/include/hw/i386/smbios.h @@ -14,7 +14,7 @@ */ int smbios_entry_add(const char *t); -void smbios_add_field(int type, int offset, int len, void *data); +void smbios_add_field(int type, int offset, const void *data, size_t len); uint8_t *smbios_get_table(size_t *length); /*