* [PATCH] qom: Check for wellformed id in user_creatable_add_type()
@ 2021-03-02 17:16 Kevin Wolf
2021-03-02 19:00 ` Eric Blake
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Kevin Wolf @ 2021-03-02 17:16 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, berrange, ehabkost, qemu-block, armbru, pbonzini
Most code paths for creating a user creatable object go through
QemuOpts, which ensures that the provided 'id' option is actually a
valid identifier.
However, there are some code paths that don't go through QemuOpts:
qemu-storage-daemon --object (since commit 8db1efd3) and QMP object-add
(since it was first introduced in commit cff8b2c6). We need to have the
same validity check for those, too.
This adds the check and makes it print the same error message as
QemuOpts on failure.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
This makes sense even without the -object QAPIfication, so no reason to
wait for v3 of that series to get this fixed.
qom/object_interfaces.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 1e9ad6f08a..515ca4557e 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -8,6 +8,7 @@
#include "qapi/qobject-input-visitor.h"
#include "qom/object_interfaces.h"
#include "qemu/help_option.h"
+#include "qemu/id.h"
#include "qemu/module.h"
#include "qemu/option.h"
#include "qapi/opts-visitor.h"
@@ -41,11 +42,19 @@ Object *user_creatable_add_type(const char *type, const char *id,
const QDict *qdict,
Visitor *v, Error **errp)
{
+ ERRP_GUARD();
Object *obj;
ObjectClass *klass;
const QDictEntry *e;
Error *local_err = NULL;
+ if (!id_wellformed(id)) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id", "an identifier");
+ error_append_hint(errp, "Identifiers consist of letters, digits, "
+ "'-', '.', '_', starting with a letter.\n");
+ return NULL;
+ }
+
klass = object_class_by_name(type);
if (!klass) {
error_setg(errp, "invalid object type: %s", type);
--
2.29.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] qom: Check for wellformed id in user_creatable_add_type()
2021-03-02 17:16 [PATCH] qom: Check for wellformed id in user_creatable_add_type() Kevin Wolf
@ 2021-03-02 19:00 ` Eric Blake
2021-03-02 19:43 ` Paolo Bonzini
2021-03-06 10:50 ` Paolo Bonzini
2 siblings, 0 replies; 5+ messages in thread
From: Eric Blake @ 2021-03-02 19:00 UTC (permalink / raw)
To: Kevin Wolf, qemu-devel; +Cc: pbonzini, berrange, ehabkost, qemu-block, armbru
On 3/2/21 11:16 AM, Kevin Wolf wrote:
> Most code paths for creating a user creatable object go through
> QemuOpts, which ensures that the provided 'id' option is actually a
> valid identifier.
>
> However, there are some code paths that don't go through QemuOpts:
> qemu-storage-daemon --object (since commit 8db1efd3) and QMP object-add
> (since it was first introduced in commit cff8b2c6). We need to have the
> same validity check for those, too.
>
> This adds the check and makes it print the same error message as
> QemuOpts on failure.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
> This makes sense even without the -object QAPIfication, so no reason to
> wait for v3 of that series to get this fixed.
>
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] qom: Check for wellformed id in user_creatable_add_type()
2021-03-02 17:16 [PATCH] qom: Check for wellformed id in user_creatable_add_type() Kevin Wolf
2021-03-02 19:00 ` Eric Blake
@ 2021-03-02 19:43 ` Paolo Bonzini
2021-03-06 10:50 ` Paolo Bonzini
2 siblings, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2021-03-02 19:43 UTC (permalink / raw)
To: Kevin Wolf, qemu-devel; +Cc: berrange, armbru, qemu-block, ehabkost
On 02/03/21 18:16, Kevin Wolf wrote:
> Most code paths for creating a user creatable object go through
> QemuOpts, which ensures that the provided 'id' option is actually a
> valid identifier.
>
> However, there are some code paths that don't go through QemuOpts:
> qemu-storage-daemon --object (since commit 8db1efd3) and QMP object-add
> (since it was first introduced in commit cff8b2c6). We need to have the
> same validity check for those, too.
>
> This adds the check and makes it print the same error message as
> QemuOpts on failure.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
> This makes sense even without the -object QAPIfication, so no reason to
> wait for v3 of that series to get this fixed.
>
> qom/object_interfaces.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
> index 1e9ad6f08a..515ca4557e 100644
> --- a/qom/object_interfaces.c
> +++ b/qom/object_interfaces.c
> @@ -8,6 +8,7 @@
> #include "qapi/qobject-input-visitor.h"
> #include "qom/object_interfaces.h"
> #include "qemu/help_option.h"
> +#include "qemu/id.h"
> #include "qemu/module.h"
> #include "qemu/option.h"
> #include "qapi/opts-visitor.h"
> @@ -41,11 +42,19 @@ Object *user_creatable_add_type(const char *type, const char *id,
> const QDict *qdict,
> Visitor *v, Error **errp)
> {
> + ERRP_GUARD();
> Object *obj;
> ObjectClass *klass;
> const QDictEntry *e;
> Error *local_err = NULL;
>
> + if (!id_wellformed(id)) {
> + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id", "an identifier");
> + error_append_hint(errp, "Identifiers consist of letters, digits, "
> + "'-', '.', '_', starting with a letter.\n");
> + return NULL;
> + }
> +
> klass = object_class_by_name(type);
> if (!klass) {
> error_setg(errp, "invalid object type: %s", type);
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] qom: Check for wellformed id in user_creatable_add_type()
2021-03-02 17:16 [PATCH] qom: Check for wellformed id in user_creatable_add_type() Kevin Wolf
2021-03-02 19:00 ` Eric Blake
2021-03-02 19:43 ` Paolo Bonzini
@ 2021-03-06 10:50 ` Paolo Bonzini
2021-03-08 11:17 ` Kevin Wolf
2 siblings, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2021-03-06 10:50 UTC (permalink / raw)
To: Kevin Wolf, qemu-devel; +Cc: berrange, ehabkost, qemu-block, armbru
On 02/03/21 18:16, Kevin Wolf wrote:
> Most code paths for creating a user creatable object go through
> QemuOpts, which ensures that the provided 'id' option is actually a
> valid identifier.
>
> However, there are some code paths that don't go through QemuOpts:
> qemu-storage-daemon --object (since commit 8db1efd3) and QMP object-add
> (since it was first introduced in commit cff8b2c6). We need to have the
> same validity check for those, too.
>
> This adds the check and makes it print the same error message as
> QemuOpts on failure.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
> This makes sense even without the -object QAPIfication, so no reason to
> wait for v3 of that series to get this fixed.
It needs a check for id != NULL, but no big deal so I added it.
Thanks,
Paolo
> qom/object_interfaces.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
> index 1e9ad6f08a..515ca4557e 100644
> --- a/qom/object_interfaces.c
> +++ b/qom/object_interfaces.c
> @@ -8,6 +8,7 @@
> #include "qapi/qobject-input-visitor.h"
> #include "qom/object_interfaces.h"
> #include "qemu/help_option.h"
> +#include "qemu/id.h"
> #include "qemu/module.h"
> #include "qemu/option.h"
> #include "qapi/opts-visitor.h"
> @@ -41,11 +42,19 @@ Object *user_creatable_add_type(const char *type, const char *id,
> const QDict *qdict,
> Visitor *v, Error **errp)
> {
> + ERRP_GUARD();
> Object *obj;
> ObjectClass *klass;
> const QDictEntry *e;
> Error *local_err = NULL;
>
> + if (!id_wellformed(id)) {
> + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id", "an identifier");
> + error_append_hint(errp, "Identifiers consist of letters, digits, "
> + "'-', '.', '_', starting with a letter.\n");
> + return NULL;
> + }
> +
> klass = object_class_by_name(type);
> if (!klass) {
> error_setg(errp, "invalid object type: %s", type);
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] qom: Check for wellformed id in user_creatable_add_type()
2021-03-06 10:50 ` Paolo Bonzini
@ 2021-03-08 11:17 ` Kevin Wolf
0 siblings, 0 replies; 5+ messages in thread
From: Kevin Wolf @ 2021-03-08 11:17 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: armbru, berrange, qemu-devel, qemu-block, ehabkost
Am 06.03.2021 um 11:50 hat Paolo Bonzini geschrieben:
> On 02/03/21 18:16, Kevin Wolf wrote:
> > Most code paths for creating a user creatable object go through
> > QemuOpts, which ensures that the provided 'id' option is actually a
> > valid identifier.
> >
> > However, there are some code paths that don't go through QemuOpts:
> > qemu-storage-daemon --object (since commit 8db1efd3) and QMP object-add
> > (since it was first introduced in commit cff8b2c6). We need to have the
> > same validity check for those, too.
> >
> > This adds the check and makes it print the same error message as
> > QemuOpts on failure.
> >
> > Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> > ---
> > This makes sense even without the -object QAPIfication, so no reason to
> > wait for v3 of that series to get this fixed.
>
> It needs a check for id != NULL, but no big deal so I added it.
Oops, yes. Thanks for fixing it up.
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-08 11:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-02 17:16 [PATCH] qom: Check for wellformed id in user_creatable_add_type() Kevin Wolf
2021-03-02 19:00 ` Eric Blake
2021-03-02 19:43 ` Paolo Bonzini
2021-03-06 10:50 ` Paolo Bonzini
2021-03-08 11:17 ` Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).