[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/21] qom: Do not reuse errp after a possible error
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 01/21] qom: Do not reuse errp after a possible error |
Date: |
Sat, 19 Sep 2015 16:43:10 +0200 |
From: Markus Armbruster <address@hidden>
The argument for an Error **errp parameter must point to a null
pointer. If it doesn't, and an error happens, error_set() fails its
assertion.
Instead of
foo(foos, errp);
bar(bars, errp);
you need to do something like
Error *err = NULL;
foo(foos, &err);
if (err) {
error_propagate(errp, err);
goto out;
}
bar(bars, errp);
out:
Screwed up in commit 0e55884 (v1.3.0): property_get_bool().
Screwed up in commit 1f21772 (v2.1.0): object_property_get_enum() and
object_property_get_uint16List().
Screwed up in commit a8e3fbe (v2.4.0): property_get_enum(),
property_set_enum().
Found by inspection, no actual crashes observed.
Fix them up.
Cc: Anthony Liguori <address@hidden>
Cc: Hu Tao <address@hidden>
Cc: Daniel P. Berrange <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Cc: address@hidden
Signed-off-by: Andreas Färber <address@hidden>
---
qom/object.c | 41 +++++++++++++++++++++++++++++++++++------
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index b7b05d3..f28d703 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1098,6 +1098,7 @@ typedef struct EnumProperty {
int object_property_get_enum(Object *obj, const char *name,
const char *typename, Error **errp)
{
+ Error *err = NULL;
StringOutputVisitor *sov;
StringInputVisitor *siv;
char *str;
@@ -1119,7 +1120,12 @@ int object_property_get_enum(Object *obj, const char
*name,
enumprop = prop->opaque;
sov = string_output_visitor_new(false);
- object_property_get(obj, string_output_get_visitor(sov), name, errp);
+ object_property_get(obj, string_output_get_visitor(sov), name, &err);
+ if (err) {
+ error_propagate(errp, err);
+ string_output_visitor_cleanup(sov);
+ return 0;
+ }
str = string_output_get_string(sov);
siv = string_input_visitor_new(str);
string_output_visitor_cleanup(sov);
@@ -1135,21 +1141,27 @@ int object_property_get_enum(Object *obj, const char
*name,
void object_property_get_uint16List(Object *obj, const char *name,
uint16List **list, Error **errp)
{
+ Error *err = NULL;
StringOutputVisitor *ov;
StringInputVisitor *iv;
char *str;
ov = string_output_visitor_new(false);
object_property_get(obj, string_output_get_visitor(ov),
- name, errp);
+ name, &err);
+ if (err) {
+ error_propagate(errp, err);
+ goto out;
+ }
str = string_output_get_string(ov);
iv = string_input_visitor_new(str);
visit_type_uint16List(string_input_get_visitor(iv),
list, NULL, errp);
g_free(str);
- string_output_visitor_cleanup(ov);
string_input_visitor_cleanup(iv);
+out:
+ string_output_visitor_cleanup(ov);
}
void object_property_parse(Object *obj, const char *string,
@@ -1665,8 +1677,14 @@ static void property_get_bool(Object *obj, Visitor *v,
void *opaque,
{
BoolProperty *prop = opaque;
bool value;
+ Error *err = NULL;
+
+ value = prop->get(obj, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
- value = prop->get(obj, errp);
visit_type_bool(v, &value, name, errp);
}
@@ -1720,8 +1738,14 @@ static void property_get_enum(Object *obj, Visitor *v,
void *opaque,
{
EnumProperty *prop = opaque;
int value;
+ Error *err = NULL;
+
+ value = prop->get(obj, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
- value = prop->get(obj, errp);
visit_type_enum(v, &value, prop->strings, NULL, name, errp);
}
@@ -1730,8 +1754,13 @@ static void property_set_enum(Object *obj, Visitor *v,
void *opaque,
{
EnumProperty *prop = opaque;
int value;
+ Error *err = NULL;
- visit_type_enum(v, &value, prop->strings, NULL, name, errp);
+ visit_type_enum(v, &value, prop->strings, NULL, name, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
prop->set(obj, value, errp);
}
--
2.1.4
- [Qemu-devel] [PULL 00/21] QOM devices patch queue 2015-09-19, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 04/21] machine: MACHINE_TYPE_NAME macro, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 03/21] qdev: Do not use slow [*] expansion for GPIO creation, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 02/21] qom: Fix invalid error check in property_get_str(), Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 01/21] qom: Do not reuse errp after a possible error,
Andreas Färber <=
- [Qemu-devel] [PULL 05/21] vexpress: Don't set name on abstract class, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 06/21] vexpress: Rename machine classes to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 07/21] arm: Rename virt machine class to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 09/21] s390-virtio: Rename machine class name to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 12/21] machine: Ensure all TYPE_MACHINE subclasses have the right suffix, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 10/21] s390: Rename s390-ccw-virtio-2.4 class name to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 08/21] pseries: Rename machine class names to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 11/21] mac99: Use MACHINE_TYPE_NAME to encode class name, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 14/21] exynos4: Use EXYNOS4210_NCPUS instead of max_cpus on error message, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 13/21] machine: Set MachineClass::name automatically, Andreas Färber, 2015/09/19