From nobody Tue May 7 03:36:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593002724; cv=none; d=zohomail.com; s=zohoarc; b=TGqPGBVM8dcKTfChHMEZ2EZ2BmyA/J7TVtVGYzJeZuuPnRVseJVuaZYsUWyek07giZUM3A1sYTqdUrDtrE3G202we1gn/Xe7UYiwPhrSWkhKmqUaxMT+oJtgTAQq5JhV9zCDQMrID0Jm1UJUW0+wYgUBXqVcSx5tWMeQL82IiNQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593002724; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TYW+9C1ZBfz6IgTjhYqWjoBu/8bKIfmwR3uu8Mfxdlo=; b=WztwFxr6iEDYpTg4Q1uLp2X3HjxCajjOPae3Sp0hi3cuHwG3KNDX/AWjJVz6es4c7/pxCLRObQrPI8a+gS32PD48biGfW7U6UXadPihZrNRtQiwTsEJPr0FZi+JyagLdipiaPnmObeJiqluVJrBPOjhTa6VEyufMARYJ6fqK5AM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593002724327318.04180410047957; Wed, 24 Jun 2020 05:45:24 -0700 (PDT) Received: from localhost ([::1]:48698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jo4mJ-0006zW-4Q for importer@patchew.org; Wed, 24 Jun 2020 08:45:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jo4l3-0005bQ-C3 for qemu-devel@nongnu.org; Wed, 24 Jun 2020 08:44:05 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:54130 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jo4l1-0000Mr-Aj for qemu-devel@nongnu.org; Wed, 24 Jun 2020 08:44:05 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-84-EHRMgz58PYucyv6zRgQWZg-1; Wed, 24 Jun 2020 08:43:13 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9407A107ACCA; Wed, 24 Jun 2020 12:43:12 +0000 (UTC) Received: from laptop.redhat.com (ovpn-114-197.ams2.redhat.com [10.36.114.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB4C11A836; Wed, 24 Jun 2020 12:43:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593002642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TYW+9C1ZBfz6IgTjhYqWjoBu/8bKIfmwR3uu8Mfxdlo=; b=X8Q2Ylv1aMnSrCuP9n8CtwEAyojQlpogjSfA7AvNVA3Ef/+TiuvcvBP+4iOPu5VHpn3W3m bNPz49ipdjtpoZQapZ/ZmZPw7sAswBNNQ+XVcYRSyzDSBXUQ08tdwVxg94lU/sQBAJ3WZx iTW40sSaTE+NF52wmCK0Bxc5O534quE= X-MC-Unique: EHRMgz58PYucyv6zRgQWZg-1 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com, armbru@redhat.com Subject: [PATCH v2 1/2] qom: Introduce object_property_try_add_child() Date: Wed, 24 Jun 2020 14:43:00 +0200 Message-Id: <20200624124301.7112-2-eric.auger@redhat.com> In-Reply-To: <20200624124301.7112-1-eric.auger@redhat.com> References: <20200624124301.7112-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 00:34:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" object_property_add() does not allow object_property_try_add() to gracefully fail as &error_abort is passed as an error handle. However such failure can easily be triggered from the QMP shell when, for instance, one attempts to create an object with an id that already exists. This is achived from the following call path: user_creatable_add_type -> object_property_add_child -> object_property_add For instance, call twice: object-add qom-type=3Dmemory-backend-ram id=3Dmem1 props.size=3D1073741824 and QEMU aborts. This behavior is undesired as a user/management application mistake in reusing a property ID shouldn't result in loss of the VM and live data within. This patch introduces a new function, object_property_try_add_child() which takes an error handle and turn object_property_try_add() into a non-static one. Now the call path becomes: user_creatable_add_type -> object_property_try_add_child -> object_property_try_add and the error is returned gracefully to the QMP client. (QEMU) object-add qom-type=3Dmemory-backend-ram id=3Dmem2 props.size=3D429= 4967296 {"return": {}} (QEMU) object-add qom-type=3Dmemory-backend-ram id=3Dmem2 props.size=3D429= 4967296 {"error": {"class": "GenericError", "desc": "attempt to add duplicate prope= rty 'mem2' to object (type 'container')"}} Signed-off-by: Eric Auger Fixes: d2623129a7de ("qom: Drop parameter @errp of object_property_add() & = friends") --- include/qom/object.h | 24 ++++++++++++++++++++++-- qom/object.c | 22 +++++++++++++++++----- qom/object_interfaces.c | 7 +++++-- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 94a61ccc3f..91cf058d86 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1039,7 +1039,7 @@ Object *object_ref(Object *obj); void object_unref(Object *obj); =20 /** - * object_property_add: + * object_property_try_add: * @obj: the object to add a property to * @name: the name of the property. This can contain any character except= for * a forward slash. In general, you should use hyphens '-' instead of @@ -1056,10 +1056,22 @@ void object_unref(Object *obj); * meant to allow a property to free its opaque upon object * destruction. This may be NULL. * @opaque: an opaque pointer to pass to the callbacks for the property + * @errp: error handle * * Returns: The #ObjectProperty; this can be used to set the @resolve * callback for child and link properties. */ +ObjectProperty *object_property_try_add(Object *obj, const char *name, + const char *type, + ObjectPropertyAccessor *get, + ObjectPropertyAccessor *set, + ObjectPropertyRelease *release, + void *opaque, Error **errp); + +/** + * object_property_add: same as object_property_try_add with + * errp hardcoded to &error_abort + */ ObjectProperty *object_property_add(Object *obj, const char *name, const char *type, ObjectPropertyAccessor *get, @@ -1495,10 +1507,11 @@ Object *object_resolve_path_type(const char *path, = const char *typename, Object *object_resolve_path_component(Object *parent, const char *part); =20 /** - * object_property_add_child: + * object_property_try_add_child: * @obj: the object to add a property to * @name: the name of the property * @child: the child object + * @errp: error handle * * Child properties form the composition tree. All objects need to be a c= hild * of another object. Objects can only be a child of one object. @@ -1512,6 +1525,13 @@ Object *object_resolve_path_component(Object *parent= , const char *part); * * Returns: The newly added property on success, or %NULL on failure. */ +ObjectProperty *object_property_try_add_child(Object *obj, const char *nam= e, + Object *child, Error **errp); + +/** + * object_property_add_child: same as object_property_try_add_child with + * errp hardcoded to &error_abort + */ ObjectProperty *object_property_add_child(Object *obj, const char *name, Object *child); =20 diff --git a/qom/object.c b/qom/object.c index 6ece96bc2b..96e85cdaf7 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1132,7 +1132,7 @@ void object_unref(Object *obj) } } =20 -static ObjectProperty * +ObjectProperty * object_property_try_add(Object *obj, const char *name, const char *type, ObjectPropertyAccessor *get, ObjectPropertyAccessor *set, @@ -1651,8 +1651,8 @@ static void object_finalize_child_property(Object *ob= j, const char *name, } =20 ObjectProperty * -object_property_add_child(Object *obj, const char *name, - Object *child) +object_property_try_add_child(Object *obj, const char *name, + Object *child, Error **errp) { g_autofree char *type =3D NULL; ObjectProperty *op; @@ -1661,14 +1661,26 @@ object_property_add_child(Object *obj, const char *= name, =20 type =3D g_strdup_printf("child<%s>", object_get_typename(child)); =20 - op =3D object_property_add(obj, name, type, object_get_child_property,= NULL, - object_finalize_child_property, child); + op =3D object_property_try_add(obj, name, type, object_get_child_prope= rty, + NULL, object_finalize_child_property, + child, errp); + if (!op) { + goto out; + } op->resolve =3D object_resolve_child_property; +out: object_ref(child); child->parent =3D obj; return op; } =20 +ObjectProperty * +object_property_add_child(Object *obj, const char *name, + Object *child) +{ + return object_property_try_add_child(obj, name, child, &error_abort); +} + void object_property_allow_set_link(const Object *obj, const char *name, Object *val, Error **errp) { diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 7e26f86fa6..1e05e41d2f 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -82,8 +82,11 @@ Object *user_creatable_add_type(const char *type, const = char *id, } =20 if (id !=3D NULL) { - object_property_add_child(object_get_objects_root(), - id, obj); + object_property_try_add_child(object_get_objects_root(), + id, obj, &local_err); + if (local_err) { + goto out; + } } =20 user_creatable_complete(USER_CREATABLE(obj), &local_err); --=20 2.20.1 From nobody Tue May 7 03:36:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593002664; cv=none; d=zohomail.com; s=zohoarc; b=HLOlqw5xQtjeox3tEnOmTKkymcSboqqXNioS2vrCB1rcPBeHjPc0qupnb0xIJx21H0K8zN5QjS9SeXLE69tZInsrNqQuM3TF1btkN9QH8e1FCL2e1SF9xMS75zi6aXDBn/2lKbuDPZjlZKTTSmpEapYjZO71Kb18BeANqE7tfbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593002664; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sy2E6fDFrrUa0s58uBcE20HeImA76gOFOqgx7UfR2yc=; b=c80wgtuQlF5ZLzJaM8ZfBqq+nyjA8jyTi72WSpGMBUssvZXJorgUuSLP/fAW38pfjBNk+h4UA8X38AfMr0/otwF2nEG03DZZbxvArFkpGjisR4zCE0MG6FCCY95c7Lw5ra/QlQwi5UqKeQTp+8grq96lxMXvpED0AYdUe4m0ims= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593002664830315.41452127207344; Wed, 24 Jun 2020 05:44:24 -0700 (PDT) Received: from localhost ([::1]:45508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jo4lL-0005hP-I0 for importer@patchew.org; Wed, 24 Jun 2020 08:44:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jo4kJ-0004Qb-Hh for qemu-devel@nongnu.org; Wed, 24 Jun 2020 08:43:19 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:50967 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jo4kH-0008UB-U4 for qemu-devel@nongnu.org; Wed, 24 Jun 2020 08:43:19 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-289-0gBaSDxsPyy-XyMoMNo79Q-1; Wed, 24 Jun 2020 08:43:15 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9953D8015F7; Wed, 24 Jun 2020 12:43:14 +0000 (UTC) Received: from laptop.redhat.com (ovpn-114-197.ams2.redhat.com [10.36.114.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id E77022B4AC; Wed, 24 Jun 2020 12:43:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593002596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sy2E6fDFrrUa0s58uBcE20HeImA76gOFOqgx7UfR2yc=; b=Hr+g/3ZPaRva3Nnl3W7nCGyB8/6yeVONh09JNEbbVXOEbSF+NbA6SPn74CZvXjFStxaALQ tsDPGiywpG9iJMN8xMQOUgK+o24UdA28p/OVRw0NtQpXVTzOOAES6wOaOGxlbl8+Dvcvqy klOF/O8lr31gL6a4+wU0/pq/cGoOtms= X-MC-Unique: 0gBaSDxsPyy-XyMoMNo79Q-1 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com, armbru@redhat.com Subject: [PATCH v2 2/2] tests/qmp-cmd-test: Add qmp/object-add-duplicate-id Date: Wed, 24 Jun 2020 14:43:01 +0200 Message-Id: <20200624124301.7112-3-eric.auger@redhat.com> In-Reply-To: <20200624124301.7112-1-eric.auger@redhat.com> References: <20200624124301.7112-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 01:59:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This new test checks that attempting to create an object with an existing ID gracefully fails. Signed-off-by: Eric Auger Acked-by: Thomas Huth --- tests/qtest/qmp-cmd-test.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c index 9f5228cd99..9510051c35 100644 --- a/tests/qtest/qmp-cmd-test.c +++ b/tests/qtest/qmp-cmd-test.c @@ -213,6 +213,22 @@ static void test_object_add_without_props(void) qtest_quit(qts); } =20 +static void test_object_add_with_duplicate_id(void) +{ + QTestState *qts; + QDict *resp; + + qts =3D qtest_init(common_args); + resp =3D qtest_qmp(qts, "{'execute': 'object-add', 'arguments':" + " {'qom-type': 'memory-backend-ram', 'id': 'ram1', 'pr= ops': {'size': 4294967296 } } }"); + g_assert_nonnull(resp); + g_assert(qdict_haskey(resp, "return")); + resp =3D qtest_qmp(qts, "{'execute': 'object-add', 'arguments':" + " {'qom-type': 'memory-backend-ram', 'id': 'ram1', 'pr= ops': {'size': 4294967296 } } }"); + qmp_assert_error_class(resp, "GenericError"); + qtest_quit(qts); +} + int main(int argc, char *argv[]) { QmpSchema schema; @@ -225,6 +241,8 @@ int main(int argc, char *argv[]) =20 qtest_add_func("qmp/object-add-without-props", test_object_add_without_props); + qtest_add_func("qmp/object-add-duplicate-id", + test_object_add_with_duplicate_id); /* TODO: add coverage of generic object-add failure modes */ =20 ret =3D g_test_run(); --=20 2.20.1