From nobody Wed Oct 29 22:56:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526318483912357.6991139330736; Mon, 14 May 2018 10:21:23 -0700 (PDT) Received: from localhost ([::1]:47403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIHA2-0003Ax-SH for importer@patchew.org; Mon, 14 May 2018 13:21:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIH83-0001w6-Cu for qemu-devel@nongnu.org; Mon, 14 May 2018 13:19:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIH81-0006H6-Cu for qemu-devel@nongnu.org; Mon, 14 May 2018 13:19:19 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:58066 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fIH81-0006Gt-9O for qemu-devel@nongnu.org; Mon, 14 May 2018 13:19:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E3A70F1237; Mon, 14 May 2018 17:19:16 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1D912024CB4; Mon, 14 May 2018 17:19:15 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 14 May 2018 18:19:11 +0100 Message-Id: <20180514171913.17664-2-berrange@redhat.com> In-Reply-To: <20180514171913.17664-1-berrange@redhat.com> References: <20180514171913.17664-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 14 May 2018 17:19:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 14 May 2018 17:19:16 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'berrange@redhat.com' RCPT:'' Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/3] i386: fix regression parsing multiboot initrd modules X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The logic for parsing the multiboot initrd modules was messed up in commit 950c4e6c94b15cd0d8b63891dddd7a8dbf458e6a Author: Daniel P. Berrang=C3=A9 Date: Mon Apr 16 12:17:43 2018 +0100 opts: don't silently truncate long option values Causing the length to be undercounter, and the number of modules over counted. It also passes NULL to get_opt_value() which was not robust at accepting a NULL value. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eduardo Habkost Tested-by: Roman Kagan --- hw/i386/multiboot.c | 3 +-- util/qemu-option.c | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 7a2953e26f..8e26545814 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -292,8 +292,7 @@ int load_multiboot(FWCfgState *fw_cfg, cmdline_len +=3D strlen(kernel_cmdline) + 1; if (initrd_filename) { const char *r =3D get_opt_value(initrd_filename, NULL); - cmdline_len +=3D strlen(r) + 1; - mbs.mb_mods_avail =3D 1; + cmdline_len +=3D strlen(initrd_filename) + 1; while (1) { mbs.mb_mods_avail++; r =3D get_opt_value(r, NULL); diff --git a/util/qemu-option.c b/util/qemu-option.c index 58d1c23893..8a68bc2314 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -75,7 +75,9 @@ const char *get_opt_value(const char *p, char **value) size_t capacity =3D 0, length; const char *offset; =20 - *value =3D NULL; + if (value) { + *value =3D NULL; + } while (1) { offset =3D strchr(p, ','); if (!offset) { --=20 2.17.0 From nobody Wed Oct 29 22:56:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526318490046412.80472505809064; Mon, 14 May 2018 10:21:30 -0700 (PDT) Received: from localhost ([::1]:47402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIHA3-0003Av-Fd for importer@patchew.org; Mon, 14 May 2018 13:21:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIH83-0001w7-Rt for qemu-devel@nongnu.org; Mon, 14 May 2018 13:19:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIH82-0006Iu-Ro for qemu-devel@nongnu.org; Mon, 14 May 2018 13:19:19 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:58072 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fIH82-0006Hh-Mj for qemu-devel@nongnu.org; Mon, 14 May 2018 13:19:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5455CE4480; Mon, 14 May 2018 17:19:18 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24E872024CB4; Mon, 14 May 2018 17:19:17 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 14 May 2018 18:19:12 +0100 Message-Id: <20180514171913.17664-3-berrange@redhat.com> In-Reply-To: <20180514171913.17664-1-berrange@redhat.com> References: <20180514171913.17664-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 14 May 2018 17:19:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 14 May 2018 17:19:18 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'berrange@redhat.com' RCPT:'' Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 2/3] i386: only parse the initrd_filename once for multiboot modules X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The multiboot code parses the initrd_filename twice, first to count how many entries there are, and second to process each entry. This changes the first loop to store the parse module names in a list, and the second loop can now use these names. This avoids having to pass NULL to the get_opt_value() method which means it can safely assume a non-NULL param. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eduardo Habkost Tested-by: Roman Kagan --- hw/i386/multiboot.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 8e26545814..d519e206c5 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -161,6 +161,7 @@ int load_multiboot(FWCfgState *fw_cfg, uint8_t bootinfo[MBI_SIZE]; uint8_t *mb_bootinfo_data; uint32_t cmdline_len; + GList *mods =3D NULL; =20 /* Ok, let's see if it is a multiboot image. The header is 12x32bit long, so the latest entry may be 8192 - 48. = */ @@ -291,15 +292,16 @@ int load_multiboot(FWCfgState *fw_cfg, cmdline_len =3D strlen(kernel_filename) + 1; cmdline_len +=3D strlen(kernel_cmdline) + 1; if (initrd_filename) { - const char *r =3D get_opt_value(initrd_filename, NULL); + const char *r =3D initrd_filename; cmdline_len +=3D strlen(initrd_filename) + 1; - while (1) { + while (*r) { + char *value; + r =3D get_opt_value(r, &value); mbs.mb_mods_avail++; - r =3D get_opt_value(r, NULL); - if (!*r) { - break; + mods =3D g_list_append(mods, value); + if (*r) { + r++; } - r++; } } =20 @@ -314,20 +316,16 @@ int load_multiboot(FWCfgState *fw_cfg, mbs.offset_cmdlines =3D mbs.offset_mbinfo + mbs.mb_mods_avail * MB_M= OD_SIZE; mbs.offset_bootloader =3D mbs.offset_cmdlines + cmdline_len; =20 - if (initrd_filename) { - const char *next_initrd; - char not_last; - char *one_file =3D NULL; - + if (mods) { + GList *tmpl =3D mods; mbs.offset_mods =3D mbs.mb_buf_size; =20 - do { + while (tmpl) { char *next_space; int mb_mod_length; uint32_t offs =3D mbs.mb_buf_size; + char *one_file =3D tmpl->data; =20 - next_initrd =3D get_opt_value(initrd_filename, &one_file); - not_last =3D *next_initrd; /* if a space comes after the module filename, treat everything after that as parameters */ hwaddr c =3D mb_add_cmdline(&mbs, one_file); @@ -352,10 +350,10 @@ int load_multiboot(FWCfgState *fw_cfg, mb_debug("mod_start: %p\nmod_end: %p\n cmdline: "TARGET_FMT= _plx, (char *)mbs.mb_buf + offs, (char *)mbs.mb_buf + offs + mb_mod_length, c); - initrd_filename =3D next_initrd+1; g_free(one_file); - one_file =3D NULL; - } while (not_last); + tmpl =3D tmpl->next; + } + g_list_free(mods); } =20 /* Commandline support */ --=20 2.17.0 From nobody Wed Oct 29 22:56:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526318582010297.363420363337; Mon, 14 May 2018 10:23:02 -0700 (PDT) Received: from localhost ([::1]:47411 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIHBd-0004Q6-By for importer@patchew.org; Mon, 14 May 2018 13:23:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIH85-0001wp-60 for qemu-devel@nongnu.org; Mon, 14 May 2018 13:19:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIH84-0006LY-7Z for qemu-devel@nongnu.org; Mon, 14 May 2018 13:19:21 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:32824 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fIH84-0006LH-3L for qemu-devel@nongnu.org; Mon, 14 May 2018 13:19:20 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BAEB7407049C; Mon, 14 May 2018 17:19:19 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A3D82024CB4; Mon, 14 May 2018 17:19:18 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 14 May 2018 18:19:13 +0100 Message-Id: <20180514171913.17664-4-berrange@redhat.com> In-Reply-To: <20180514171913.17664-1-berrange@redhat.com> References: <20180514171913.17664-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 14 May 2018 17:19:19 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 14 May 2018 17:19:19 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'berrange@redhat.com' RCPT:'' Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 3/3] opts: remove redundant check for NULL parameter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" No callers of get_opt_value() pass in a NULL for the "value" parameter, so the check is redundant. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eduardo Habkost Tested-by: Roman Kagan --- util/qemu-option.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index 8a68bc2314..a1ff682aac 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -75,9 +75,7 @@ const char *get_opt_value(const char *p, char **value) size_t capacity =3D 0, length; const char *offset; =20 - if (value) { - *value =3D NULL; - } + *value =3D NULL; while (1) { offset =3D strchr(p, ','); if (!offset) { @@ -88,11 +86,9 @@ const char *get_opt_value(const char *p, char **value) if (*offset !=3D '\0' && *(offset + 1) =3D=3D ',') { length++; } - if (value) { - *value =3D g_renew(char, *value, capacity + length + 1); - strncpy(*value + capacity, p, length); - (*value)[capacity + length] =3D '\0'; - } + *value =3D g_renew(char, *value, capacity + length + 1); + strncpy(*value + capacity, p, length); + (*value)[capacity + length] =3D '\0'; capacity +=3D length; if (*offset =3D=3D '\0' || *(offset + 1) !=3D ',') { --=20 2.17.0