[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/47] qom: Add error handler for object alias proper
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 05/47] qom: Add error handler for object alias property |
Date: |
Wed, 15 Oct 2014 05:08:39 +0200 |
From: Gonglei <address@hidden>
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 <address@hidden>
Cc: Michael S. Tsirkin <address@hidden>
Cc: Markus Armbruster <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
qom/object.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/qom/object.c b/qom/object.c
index 21135e1..575291f 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -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) {
@@ -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);
}
--
1.8.4.5
- [Qemu-devel] [PULL 00/47] QOM devices patch queue 2014-10-15, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 01/47] qdev: gpio: Don't allow name share between I and O, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 02/47] qdev: gpio: Register GPIO inputs as child objects, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 03/47] qdev: gpio: Register GPIO outputs as QOM links, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 07/47] tests: virtio-serial: Check if hot-plug/unplug works, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 06/47] tests: virtio-scsi: Check if hot-plug/unplug works, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 04/47] qom: Add error handler for object_property_print(), Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 08/47] libqos: Add qpci_plug_device_test() and qpci_unplug_acpi_device_test(), Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 09/47] tests: virtio-rng: Check if hot-plug/unplug works, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 05/47] qom: Add error handler for object alias property,
Andreas Färber <=
- [Qemu-devel] [PULL 11/47] tests: virtio-blk: Check if hot-plug/unplug works, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 10/47] tests: virtio-net: Check if hot-plug/unplug works, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 13/47] tests: usb: add port test to uhci unit test, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 16/47] tests: usb: usb-uas hotplug test, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 12/47] tests: usb: Move uhci port test code to libqos/usb.c, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 19/47] qdev: HotplugHandler: Rename unplug callback to unplug_request, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 14/47] tests: usb: Generic usb device hotplug, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 20/47] qdev: HotplugHandler: Provide unplug callback, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 15/47] tests: usb: usb-storage hotplug test, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 21/47] qdev: Add simple/generic unplug callback for HotplugHandler, Andreas Färber, 2014/10/14