[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 8/8] vl: Avoid crash when -mon is underspecified
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 8/8] vl: Avoid crash when -mon is underspecified |
Date: |
Tue, 30 Oct 2018 20:16:20 +0100 |
From: Eric Blake <address@hidden>
A quick coredump on an incomplete command line:
./x86_64-softmmu/qemu-system-x86_64 -mon mode=control,pretty=on
#0 0x00007ffff723d9e4 in g_str_hash () at /lib64/libglib-2.0.so.0
#1 0x00007ffff723ce38 in g_hash_table_lookup () at /lib64/libglib-2.0.so.0
#2 0x0000555555cc0073 in object_class_property_find (klass=0x5555566a94b0,
name=0x0, errp=0x0) at qom/object.c:1135
#3 0x0000555555cc004b in object_class_property_find (klass=0x5555566a9440,
name=0x0, errp=0x0) at qom/object.c:1129
#4 0x0000555555cbfe6e in object_property_find (obj=0x5555568348c0, name=0x0,
errp=0x0) at qom/object.c:1080
#5 0x0000555555cc183d in object_resolve_path_component
(parent=0x5555568348c0, part=0x0) at qom/object.c:1762
#6 0x0000555555d82071 in qemu_chr_find (name=0x0) at chardev/char.c:802
#7 0x00005555559d77cb in mon_init_func (opaque=0x0, opts=0x5555566b65a0,
errp=0x0) at vl.c:2291
Fix it to instead fail gracefully.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
vl.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/vl.c b/vl.c
index 7d9bcf442e..0a5cc9aa75 100644
--- a/vl.c
+++ b/vl.c
@@ -2318,6 +2318,10 @@ static int mon_init_func(void *opaque, QemuOpts *opts,
Error **errp)
flags |= MONITOR_USE_PRETTY;
chardev = qemu_opt_get(opts, "chardev");
+ if (!chardev) {
+ error_report("chardev is required");
+ exit(1);
+ }
chr = qemu_chr_find(chardev);
if (chr == NULL) {
error_setg(errp, "chardev \"%s\" not found", chardev);
--
2.17.2
- [Qemu-devel] [PULL 0/8] Monitor patches for 2018-10-30, Markus Armbruster, 2018/10/30
- [Qemu-devel] [PULL 1/8] monitor: guard iothread access by mon->use_io_thread, Markus Armbruster, 2018/10/30
- [Qemu-devel] [PULL 6/8] tests: add oob functional test for test-qmp-cmds, Markus Armbruster, 2018/10/30
- [Qemu-devel] [PULL 7/8] tests: qmp-test: add queue full test, Markus Armbruster, 2018/10/30
- [Qemu-devel] [PULL 8/8] vl: Avoid crash when -mon is underspecified,
Markus Armbruster <=
- [Qemu-devel] [PULL 5/8] Revert "tests: Add parameter to qtest_init_without_qmp_handshake", Markus Armbruster, 2018/10/30
- [Qemu-devel] [PULL 4/8] monitor: remove "x-oob", turn oob on by default, Markus Armbruster, 2018/10/30
- [Qemu-devel] [PULL 3/8] monitor: Suspend monitor instead dropping commands, Markus Armbruster, 2018/10/30
- [Qemu-devel] [PULL 2/8] monitor: delay monitor iothread creation, Markus Armbruster, 2018/10/30