From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzlJ1-0002LC-G2 for qemu-devel@nongnu.org; Fri, 20 Nov 2015 08:00:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzlIy-0001qb-2N for qemu-devel@nongnu.org; Fri, 20 Nov 2015 08:00:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37348) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzlIx-0001qU-T5 for qemu-devel@nongnu.org; Fri, 20 Nov 2015 08:00:43 -0500 From: Markus Armbruster Date: Fri, 20 Nov 2015 14:00:40 +0100 Message-Id: <1448024440-31222-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] numa: Clean up query-memdev error handling, plug leak List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: hutao@cn.fujitsu.com, ehabkost@redhat.com, mst@redhat.com qmp_query_memdev() doesn't fail. Instead, it returns an empty list. That's wrong. Two error paths: * When object_get_objects_root() returns null. It never does, so simply drop the useless error handling. * When query_memdev() fails. This can happen, and the error to return is the one that query_memdev() currently leaks. Passing the error from query_memdev() to qmp_query_memdev() isn't so simple, because object_child_foreach() is in the way. Fixable, but I'd rather not try it in hard freeze. Plug the leak, make up an error, and add a FIXME for the remaining work. Screwed up in commit 76b5d85 "qmp: add query-memdev". Signed-off-by: Markus Armbruster --- numa.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/numa.c b/numa.c index fdfe294..a584e8e 100644 --- a/numa.c +++ b/numa.c @@ -568,6 +568,7 @@ static int query_memdev(Object *obj, void *opaque) return 0; error: + error_free(err); g_free(m->value); g_free(m); @@ -576,15 +577,12 @@ error: MemdevList *qmp_query_memdev(Error **errp) { - Object *obj; + Object *obj = object_get_objects_root(); MemdevList *list = NULL; - obj = object_get_objects_root(); - if (obj == NULL) { - return NULL; - } - if (object_child_foreach(obj, query_memdev, &list) != 0) { + /* FIXME propagate the error query_memdev() throws away */ + error_setg(errp, "Unknown error"); goto error; } -- 2.4.3