From patchwork Thu Apr 28 00:01:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 8964181 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5BD8CBF29F for ; Thu, 28 Apr 2016 00:04:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AAAF120220 for ; Thu, 28 Apr 2016 00:04:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED01020117 for ; Thu, 28 Apr 2016 00:04:32 +0000 (UTC) Received: from localhost ([::1]:45852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avZRY-00067r-7M for patchwork-qemu-devel@patchwork.kernel.org; Wed, 27 Apr 2016 20:04:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avZPA-0001FD-41 for qemu-devel@nongnu.org; Wed, 27 Apr 2016 20:02:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avZP8-0005Jr-Qu for qemu-devel@nongnu.org; Wed, 27 Apr 2016 20:02:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50744) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avZP8-0005Jg-Lb for qemu-devel@nongnu.org; Wed, 27 Apr 2016 20:02:02 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 426887F342; Thu, 28 Apr 2016 00:02:02 +0000 (UTC) Received: from red.redhat.com (ovpn-113-21.phx2.redhat.com [10.3.113.21]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3S01vck019347; Wed, 27 Apr 2016 20:02:01 -0400 From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 27 Apr 2016 18:01:41 -0600 Message-Id: <1461801715-24307-10-git-send-email-eblake@redhat.com> In-Reply-To: <1461801715-24307-1-git-send-email-eblake@redhat.com> References: <1461801715-24307-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v15 09/23] qom: Wrap prop visit in visit_start_struct X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: armbru@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The qmp-input visitor was allowing callers to play rather fast and loose: when visiting a QDict, you could grab members of the root dictionary without first pushing into the dict; the final such culprit was the QOM code for converting to and from object properties. But we are about to tighten the input visitor, at which point user_creatable_add_type() as called with a QMP input visitor via qmp_object_add() MUST follow the same paradigms as everyone else, of pushing into the struct before grabbing its keys. The use of 'err ? NULL : &err' is temporary; a later patch will clean that up when it splits visit_end_struct(). The change has no impact to the testsuite now, but is required to avoid a failure in tests/test-netfilter once qmp-input is made stricter to detect inconsistent 'name' arguments on the root visit. Since user_creatable_add_type() is also called with OptsVisitor through user_creatable_add_opts(), we must also check that there is no negative impact there; both pre- and post-patch, we see: $ ./x86_64-softmmu/qemu-system-x86_64 -nographic -nodefaults -qmp stdio -object secret,id=sec0,data=letmein,format=raw,foo=bar qemu-system-x86_64: Property '.foo' not found That is, the only new checking that the new visit_end_struct() can perform is for excess input, but we already catch excess input earlier in object_property_set(). Signed-off-by: Eric Blake --- v15: hoist earlier in series, improve commit message v14: no change v13: no change v12: new patch --- qom/object_interfaces.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index ab5da35..4a60d6d 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -120,12 +120,20 @@ Object *user_creatable_add_type(const char *type, const char *id, obj = object_new(type); if (qdict) { + visit_start_struct(v, NULL, NULL, 0, &local_err); + if (local_err) { + goto out; + } for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) { object_property_set(obj, v, e->key, &local_err); if (local_err) { - goto out; + break; } } + visit_end_struct(v, local_err ? NULL : &local_err); + if (local_err) { + goto out; + } } object_property_add_child(object_get_objects_root(),