From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUFJa-0002vr-Vd for qemu-devel@nongnu.org; Wed, 17 Sep 2014 09:30:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUFJV-0007rz-NP for qemu-devel@nongnu.org; Wed, 17 Sep 2014 09:30:34 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:40318 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUFJV-0007rl-14 for qemu-devel@nongnu.org; Wed, 17 Sep 2014 09:30:29 -0400 Date: Wed, 17 Sep 2014 15:29:25 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140917132925.GA15350@irqsave.net> References: <1410953466-26543-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1410953466-26543-1-git-send-email-kwolf@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] block: Validate node-name List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: benoit.canet@irqsave.net, qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com The Wednesday 17 Sep 2014 =E0 13:31:06 (+0200), Kevin Wolf wrote : > The device_name of a BlockDriverState is currently checked because it i= s > always used as a QemuOpts ID and qemu_opts_create() checks whether such > IDs are wellformed. >=20 > node-name is supposed to share the same namespace, but it isn't checked > currently. This patch adds explicit checks both for device_name and > node-name so that the same rules will still apply even if QemuOpts won'= t > be used any more at some point. >=20 > Signed-off-by: Kevin Wolf > --- > block.c | 16 +++++++++++++--- > include/qemu/option.h | 1 + > util/qemu-option.c | 4 ++-- > 3 files changed, 16 insertions(+), 5 deletions(-) >=20 > diff --git a/block.c b/block.c > index e144fd5..bddf1a0 100644 > --- a/block.c > +++ b/block.c > @@ -335,12 +335,22 @@ void bdrv_register(BlockDriver *bdrv) > QLIST_INSERT_HEAD(&bdrv_drivers, bdrv, list); > } > =20 > +static bool bdrv_is_valid_name(const char *name) > +{ > + return qemu_opts_id_wellformed(name); > +} > + > /* create a new block device (by default it is empty) */ > BlockDriverState *bdrv_new(const char *device_name, Error **errp) > { > BlockDriverState *bs; > int i; > =20 > + if (*device_name && !bdrv_is_valid_name(device_name)) { > + error_setg(errp, "Invalid device name"); > + return NULL; > + } > + > if (bdrv_find(device_name)) { > error_setg(errp, "Device with id '%s' already exists", > device_name); > @@ -903,9 +913,9 @@ static void bdrv_assign_node_name(BlockDriverState = *bs, > return; > } > =20 > - /* empty string node name is invalid */ > - if (node_name[0] =3D=3D '\0') { > - error_setg(errp, "Empty node name"); > + /* Check for empty string or invalid characters */ > + if (!bdrv_is_valid_name(node_name)) { > + error_setg(errp, "Invalid node name"); > return; > } > =20 > diff --git a/include/qemu/option.h b/include/qemu/option.h > index 59bea75..945347c 100644 > --- a/include/qemu/option.h > +++ b/include/qemu/option.h > @@ -103,6 +103,7 @@ typedef int (*qemu_opt_loopfunc)(const char *name, = const char *value, void *opaq > int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opa= que, > int abort_on_failure); > =20 > +int qemu_opts_id_wellformed(const char *id); > QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id); > QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id, > int fail_if_exists, Error **errp); > diff --git a/util/qemu-option.c b/util/qemu-option.c > index 6dc27ce..0cf9960 100644 > --- a/util/qemu-option.c > +++ b/util/qemu-option.c > @@ -641,7 +641,7 @@ QemuOpts *qemu_opts_find(QemuOptsList *list, const = char *id) > return NULL; > } > =20 > -static int id_wellformed(const char *id) > +int qemu_opts_id_wellformed(const char *id) > { > int i; > =20 > @@ -662,7 +662,7 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, cons= t char *id, > QemuOpts *opts =3D NULL; > =20 > if (id) { > - if (!id_wellformed(id)) { > + if (!qemu_opts_id_wellformed(id)) { > error_set(errp,QERR_INVALID_PARAMETER_VALUE, "id", "an ide= ntifier"); > #if 0 /* conversion from qerror_report() to error_set() broke this: */ > error_printf_unless_qmp("Identifiers consist of letters, d= igits, '-', '.', '_', starting with a letter.\n"); > --=20 > 1.8.3.1 >=20 Reviewed-by: Benoit Canet