From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUIWj-0000u0-1A for qemu-devel@nongnu.org; Tue, 25 Aug 2015 14:00:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUIWg-0003xc-Cp for qemu-devel@nongnu.org; Tue, 25 Aug 2015 14:00:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUIWg-0003wx-5N for qemu-devel@nongnu.org; Tue, 25 Aug 2015 14:00:50 -0400 From: Markus Armbruster Date: Tue, 25 Aug 2015 20:00:45 +0200 Message-Id: <1440525646-22428-2-git-send-email-armbru@redhat.com> In-Reply-To: <1440525646-22428-1-git-send-email-armbru@redhat.com> References: <1440525646-22428-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 1/2] qom: Do not reuse errp after a possible error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hu Tao , afaerber@suse.de, Anthony Liguori 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 =3D 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: Andreas F=C3=A4rber Cc: Anthony Liguori Cc: Hu Tao Cc: Daniel P. Berrange Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrange --- qom/object.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/qom/object.c b/qom/object.c index eea8edf..6173da8 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1079,6 +1079,7 @@ typedef struct EnumProperty { int object_property_get_enum(Object *obj, const char *name, const char *typename, Error **errp) { + Error *err =3D NULL; StringOutputVisitor *sov; StringInputVisitor *siv; char *str; @@ -1100,7 +1101,12 @@ int object_property_get_enum(Object *obj, const ch= ar *name, enumprop =3D prop->opaque; =20 sov =3D 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 =3D string_output_get_string(sov); siv =3D string_input_visitor_new(str); string_output_visitor_cleanup(sov); @@ -1116,21 +1122,27 @@ int object_property_get_enum(Object *obj, const c= har *name, void object_property_get_uint16List(Object *obj, const char *name, uint16List **list, Error **errp) { + Error *err =3D NULL; StringOutputVisitor *ov; StringInputVisitor *iv; char *str; =20 ov =3D 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 =3D string_output_get_string(ov); iv =3D string_input_visitor_new(str); visit_type_uint16List(string_input_get_visitor(iv), list, NULL, errp); =20 g_free(str); - string_output_visitor_cleanup(ov); string_input_visitor_cleanup(iv); +out: + string_output_visitor_cleanup(ov); } =20 void object_property_parse(Object *obj, const char *string, @@ -1644,10 +1656,16 @@ typedef struct BoolProperty static void property_get_bool(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { + Error *err =3D NULL; BoolProperty *prop =3D opaque; bool value; =20 - value =3D prop->get(obj, errp); + value =3D prop->get(obj, &err); + if (err) { + error_propagate(errp, err); + return; + } + visit_type_bool(v, &value, name, errp); } =20 @@ -1699,20 +1717,31 @@ void object_property_add_bool(Object *obj, const = char *name, static void property_get_enum(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { + Error *err =3D NULL; EnumProperty *prop =3D opaque; int value; =20 - value =3D prop->get(obj, errp); + value =3D prop->get(obj, &err); + if (err) { + error_propagate(errp, err); + return; + } + visit_type_enum(v, &value, prop->strings, NULL, name, errp); } =20 static void property_set_enum(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { + Error *err =3D NULL; EnumProperty *prop =3D opaque; int value; =20 - 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); } =20 --=20 2.4.3