From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbPcs-0006kN-8C for qemu-devel@nongnu.org; Fri, 06 Jul 2018 08:14:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbPcr-0005px-6m for qemu-devel@nongnu.org; Fri, 06 Jul 2018 08:14:14 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39010 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fbPcr-0005pq-1G for qemu-devel@nongnu.org; Fri, 06 Jul 2018 08:14:13 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B0588E900C for ; Fri, 6 Jul 2018 12:14:12 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Fri, 6 Jul 2018 14:13:48 +0200 Message-Id: <20180706121354.2021-7-marcandre.lureau@redhat.com> In-Reply-To: <20180706121354.2021-1-marcandre.lureau@redhat.com> References: <20180706121354.2021-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 06/12] qga: process_event() simplification and leak fix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: eblake@redhat.com, armbru@redhat.com, peterx@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= json_parser_parse_err() may return something else than a QDict, in which case we loose the object. Let's keep track of the original object to avoid leaks. When an error occurs, "qdict" contains the response, but we still check the "execute" key there. Untangle a bit this code, by having a clear error path. Signed-off-by: Marc-Andr=C3=A9 Lureau --- qga/main.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/qga/main.c b/qga/main.c index 537cc0e162..0784761605 100644 --- a/qga/main.c +++ b/qga/main.c @@ -600,6 +600,7 @@ static void process_command(GAState *s, QDict *req) static void process_event(JSONMessageParser *parser, GQueue *tokens) { GAState *s =3D container_of(parser, GAState, parser); + QObject *obj; QDict *qdict; Error *err =3D NULL; int ret; @@ -607,35 +608,34 @@ static void process_event(JSONMessageParser *parser= , GQueue *tokens) g_assert(s && parser); =20 g_debug("process_event: called"); - qdict =3D qobject_to(QDict, json_parser_parse_err(tokens, NULL, &err= )); - if (err || !qdict) { - qobject_unref(qdict); - if (!err) { - g_warning("failed to parse event: unknown error"); - error_setg(&err, QERR_JSON_PARSING); - } else { - g_warning("failed to parse event: %s", error_get_pretty(err)= ); - } - qdict =3D qmp_error_response(err); + obj =3D json_parser_parse_err(tokens, NULL, &err); + if (err) { + goto err; } - - /* handle host->guest commands */ - if (qdict_haskey(qdict, "execute")) { - process_command(s, qdict); - } else { - if (!qdict_haskey(qdict, "error")) { - qobject_unref(qdict); - g_warning("unrecognized payload format"); - error_setg(&err, QERR_UNSUPPORTED); - qdict =3D qmp_error_response(err); - } - ret =3D send_response(s, qdict); - if (ret < 0) { - g_warning("error sending error response: %s", strerror(-ret)= ); - } + qdict =3D qobject_to(QDict, obj); + if (!qdict) { + error_setg(&err, QERR_JSON_PARSING); + goto err; + } + if (!qdict_haskey(qdict, "execute")) { + g_warning("unrecognized payload format"); + error_setg(&err, QERR_UNSUPPORTED); + goto err; } =20 + process_command(s, qdict); + qobject_unref(obj); + return; + +err: + g_warning("failed to parse event: %s", error_get_pretty(err)); + qdict =3D qmp_error_response(err); + ret =3D send_response(s, qdict); + if (ret < 0) { + g_warning("error sending error response: %s", strerror(-ret)); + } qobject_unref(qdict); + qobject_unref(obj); } =20 /* false return signals GAChannel to close the current client connection= */ --=20 2.18.0.rc1