From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJjaw-0003jC-Pp for qemu-devel@nongnu.org; Fri, 18 May 2018 13:55:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJjav-0007Pg-Rl for qemu-devel@nongnu.org; Fri, 18 May 2018 13:55:10 -0400 Received: from mail-ot0-x234.google.com ([2607:f8b0:4003:c0f::234]:43751) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJjav-0007PU-MN for qemu-devel@nongnu.org; Fri, 18 May 2018 13:55:09 -0400 Received: by mail-ot0-x234.google.com with SMTP id y10-v6so10069408otg.10 for ; Fri, 18 May 2018 10:55:09 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20180514171913.17664-2-berrange@redhat.com> References: <20180514171913.17664-1-berrange@redhat.com> <20180514171913.17664-2-berrange@redhat.com> From: Peter Maydell Date: Fri, 18 May 2018 18:54:48 +0100 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/3] i386: fix regression parsing multiboot initrd modules List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= Cc: QEMU Developers , Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , Paolo Bonzini , Richard Henderson On 14 May 2018 at 18:19, Daniel P. Berrang=C3=A9 wrot= e: > 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 > --- > 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; > > - *value =3D NULL; > + if (value) { > + *value =3D NULL; > + } > while (1) { > offset =3D strchr(p, ','); > if (!offset) { Don't we delete this check again in patch 3? If we're going to fix this by making multiboot.c not pass in NULL pointers, is there a reason not to simply do that? thanks -- PMM