From nobody Mon Apr 29 16:55:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549378485349625.7943842133595; Tue, 5 Feb 2019 06:54:45 -0800 (PST) Received: from localhost ([127.0.0.1]:33171 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr27T-0006HY-C3 for importer@patchew.org; Tue, 05 Feb 2019 09:54:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr25B-0004T4-UG for qemu-devel@nongnu.org; Tue, 05 Feb 2019 09:52:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr1wj-0000Tv-Sp for qemu-devel@nongnu.org; Tue, 05 Feb 2019 09:43:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51387) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gr1wi-0000Re-RM for qemu-devel@nongnu.org; Tue, 05 Feb 2019 09:43:33 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0F5481DED for ; Tue, 5 Feb 2019 14:43:30 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99E381001F4D; Tue, 5 Feb 2019 14:43:29 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 15:31:27 +0100 Message-Id: <1549377087-205549-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 05 Feb 2019 14:43:30 +0000 (UTC) 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] hostmem: fix crash when querying empty host-nodes property via QMP 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: ehabkost@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" QEMU will crashes with qapi/qobject-output-visitor.c:210: qobject_output_complete: Assertion `qov= ->root && ((&qov->stack)->slh_first =3D=3D ((void *)0))' failed when trying to get value of empty hostmem.host-nodes property. Fix it by calling visitor even if host-nodes wasn't set before exiting from property getter to return empty list. Signed-off-by: Igor Mammedov --- backends/hostmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backends/hostmem.c b/backends/hostmem.c index 0c8ef17..fe14be5 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -86,7 +86,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *= v, const char *name, =20 value =3D find_first_bit(backend->host_nodes, MAX_NODES); if (value =3D=3D MAX_NODES) { - return; + goto ret; } =20 *node =3D g_malloc0(sizeof(**node)); @@ -104,6 +104,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor= *v, const char *name, node =3D &(*node)->next; } while (true); =20 +ret: visit_type_uint16List(v, name, &host_nodes, errp); } =20 --=20 2.7.4