Przeglądaj źródła

hostmem: fix crash when querying empty host-nodes property via QMP

QEMU will crashes with
 qapi/qobject-output-visitor.c:210: qobject_output_complete: Assertion `qov->root && ((&qov->stack)->slh_first == ((void *)0))' failed
when trying to get value of not set hostmem's "host-nodes"
property, HostMemoryBackend::host_nodes bitmap doesn't have
any bits set in it, which leads to find_first_bit() returning
MAX_NODES and consequently to an early return from
host_memory_backend_get_host_nodes() without calling visitor.

Fix it by calling visitor even if "host-nodes" property wasn't
set before exiting from property getter to return valid empty
list.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20190214105733.25643-1-imammedo@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Igor Mammedov 6 lat temu
rodzic
commit
15160ab72c
1 zmienionych plików z 2 dodań i 1 usunięć
  1. 2 1
      backends/hostmem.c

+ 2 - 1
backends/hostmem.c

@@ -88,7 +88,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name,
 
 
     value = find_first_bit(backend->host_nodes, MAX_NODES);
     value = find_first_bit(backend->host_nodes, MAX_NODES);
     if (value == MAX_NODES) {
     if (value == MAX_NODES) {
-        return;
+        goto ret;
     }
     }
 
 
     *node = g_malloc0(sizeof(**node));
     *node = g_malloc0(sizeof(**node));
@@ -106,6 +106,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name,
         node = &(*node)->next;
         node = &(*node)->next;
     } while (true);
     } while (true);
 
 
+ret:
     visit_type_uint16List(v, name, &host_nodes, errp);
     visit_type_uint16List(v, name, &host_nodes, errp);
 }
 }