Skip to content

Commit

Permalink
qom: Add error handler for object alias property
Browse files Browse the repository at this point in the history
object_property_add_alias() is called at some
places at present. And its parameter errp may not NULL,
such as
 object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev),"iothread",
                              &error_abort);
This patch add error handler for security.

Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
  • Loading branch information
gongleiarei authored and afaerber committed Oct 15, 2014
1 parent 3a53009 commit 8ae9a9e
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion qom/object.c
Expand Up @@ -1642,6 +1642,7 @@ void object_property_add_alias(Object *obj, const char *name,
ObjectProperty *op;
ObjectProperty *target_prop;
gchar *prop_type;
Error *local_err = NULL;

target_prop = object_property_find(target_obj, target_name, errp);
if (!target_prop) {
Expand All @@ -1663,9 +1664,15 @@ void object_property_add_alias(Object *obj, const char *name,
property_get_alias,
property_set_alias,
property_release_alias,
prop, errp);
prop, &local_err);
if (local_err) {
error_propagate(errp, local_err);
g_free(prop);
goto out;
}
op->resolve = property_resolve_alias;

out:
g_free(prop_type);
}

Expand Down

0 comments on commit 8ae9a9e

Please sign in to comment.