mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-27 05:20:50 +00:00
246da7db3c
'obj' forgot to free at the end of hmp_qom_get(). Fix that.
The leak stack:
Direct leak of 40 byte(s) in 1 object(s) allocated from:
#0 0x7f4e3a779ae8 in __interceptor_malloc (/lib64/libasan.so.5+0xefae8)
#1 0x7f4e398f91d5 in g_malloc (/lib64/libglib-2.0.so.0+0x531d5)
#2 0x55c9fd9a3999 in qstring_from_substr /build/qemu/src/qobject/qstring.c:45
#3 0x55c9fd894bd3 in qobject_output_type_str /build/qemu/src/qapi/qobject-output-visitor.c:175
#4 0x55c9fd894bd3 in qobject_output_type_str /build/qemu/src/qapi/qobject-output-visitor.c:168
#5 0x55c9fd88b34d in visit_type_str /build/qemu/src/qapi/qapi-visit-core.c:308
#6 0x55c9fd59aa6b in property_get_str /build/qemu/src/qom/object.c:2064
#7 0x55c9fd5adb8a in object_property_get_qobject /build/qemu/src/qom/qom-qobject.c:38
#8 0x55c9fd4a029d in hmp_qom_get /build/qemu/src/qom/qom-hmp-cmds.c:66
Fixes: 89cf4fe34f
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
Message-Id: <20200603070338.7922-1-pannengyuan@huawei.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Tested-by: Li Qiang <liq3ea@gmail.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
142 lines
3.7 KiB
C
142 lines
3.7 KiB
C
/*
|
|
* HMP commands related to QOM
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or
|
|
* later. See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "hw/qdev-core.h"
|
|
#include "monitor/hmp.h"
|
|
#include "monitor/monitor.h"
|
|
#include "qapi/error.h"
|
|
#include "qapi/qapi-commands-qom.h"
|
|
#include "qapi/qmp/qdict.h"
|
|
#include "qapi/qmp/qjson.h"
|
|
#include "qapi/qmp/qstring.h"
|
|
#include "qom/object.h"
|
|
|
|
void hmp_qom_list(Monitor *mon, const QDict *qdict)
|
|
{
|
|
const char *path = qdict_get_try_str(qdict, "path");
|
|
ObjectPropertyInfoList *list;
|
|
Error *err = NULL;
|
|
|
|
if (path == NULL) {
|
|
monitor_printf(mon, "/\n");
|
|
return;
|
|
}
|
|
|
|
list = qmp_qom_list(path, &err);
|
|
if (err == NULL) {
|
|
ObjectPropertyInfoList *start = list;
|
|
while (list != NULL) {
|
|
ObjectPropertyInfo *value = list->value;
|
|
|
|
monitor_printf(mon, "%s (%s)\n",
|
|
value->name, value->type);
|
|
list = list->next;
|
|
}
|
|
qapi_free_ObjectPropertyInfoList(start);
|
|
}
|
|
hmp_handle_error(mon, err);
|
|
}
|
|
|
|
void hmp_qom_set(Monitor *mon, const QDict *qdict)
|
|
{
|
|
const char *path = qdict_get_str(qdict, "path");
|
|
const char *property = qdict_get_str(qdict, "property");
|
|
const char *value = qdict_get_str(qdict, "value");
|
|
Error *err = NULL;
|
|
QObject *obj;
|
|
|
|
obj = qobject_from_json(value, &err);
|
|
if (err == NULL) {
|
|
qmp_qom_set(path, property, obj, &err);
|
|
}
|
|
|
|
hmp_handle_error(mon, err);
|
|
}
|
|
|
|
void hmp_qom_get(Monitor *mon, const QDict *qdict)
|
|
{
|
|
const char *path = qdict_get_str(qdict, "path");
|
|
const char *property = qdict_get_str(qdict, "property");
|
|
Error *err = NULL;
|
|
QObject *obj = qmp_qom_get(path, property, &err);
|
|
|
|
if (err == NULL) {
|
|
QString *str = qobject_to_json_pretty(obj);
|
|
monitor_printf(mon, "%s\n", qstring_get_str(str));
|
|
qobject_unref(str);
|
|
}
|
|
|
|
qobject_unref(obj);
|
|
hmp_handle_error(mon, err);
|
|
}
|
|
|
|
typedef struct QOMCompositionState {
|
|
Monitor *mon;
|
|
int indent;
|
|
} QOMCompositionState;
|
|
|
|
static void print_qom_composition(Monitor *mon, Object *obj, int indent);
|
|
|
|
static int qom_composition_compare(const void *a, const void *b, void *ignore)
|
|
{
|
|
return g_strcmp0(a ? object_get_canonical_path_component(a) : NULL,
|
|
b ? object_get_canonical_path_component(b) : NULL);
|
|
}
|
|
|
|
static int insert_qom_composition_child(Object *obj, void *opaque)
|
|
{
|
|
GQueue *children = opaque;
|
|
|
|
g_queue_insert_sorted(children, obj, qom_composition_compare, NULL);
|
|
return 0;
|
|
}
|
|
|
|
static void print_qom_composition(Monitor *mon, Object *obj, int indent)
|
|
{
|
|
char *name;
|
|
GQueue children;
|
|
Object *child;
|
|
|
|
if (obj == object_get_root()) {
|
|
name = g_strdup("");
|
|
} else {
|
|
name = object_get_canonical_path_component(obj);
|
|
}
|
|
monitor_printf(mon, "%*s/%s (%s)\n", indent, "", name,
|
|
object_get_typename(obj));
|
|
g_free(name);
|
|
|
|
g_queue_init(&children);
|
|
object_child_foreach(obj, insert_qom_composition_child, &children);
|
|
while ((child = g_queue_pop_head(&children))) {
|
|
print_qom_composition(mon, child, indent + 2);
|
|
}
|
|
}
|
|
|
|
void hmp_info_qom_tree(Monitor *mon, const QDict *dict)
|
|
{
|
|
const char *path = qdict_get_try_str(dict, "path");
|
|
Object *obj;
|
|
bool ambiguous = false;
|
|
|
|
if (path) {
|
|
obj = object_resolve_path(path, &ambiguous);
|
|
if (!obj) {
|
|
monitor_printf(mon, "Path '%s' could not be resolved.\n", path);
|
|
return;
|
|
}
|
|
if (ambiguous) {
|
|
monitor_printf(mon, "Warning: Path '%s' is ambiguous.\n", path);
|
|
return;
|
|
}
|
|
} else {
|
|
obj = qdev_get_machine();
|
|
}
|
|
print_qom_composition(mon, obj, 0);
|
|
}
|