|
 |
6d3351 |
From e42a328573e2cfc9e2715d2497ca98b55c067878 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <e42a328573e2cfc9e2715d2497ca98b55c067878@dist-git>
|
|
|
6d3351 |
From: Erik Skultety <eskultet@redhat.com>
|
|
|
6d3351 |
Date: Wed, 31 May 2017 08:21:34 +0200
|
|
|
6d3351 |
Subject: [PATCH] qemu: json: Fix daemon crash on handling domain shutdown
|
|
|
6d3351 |
event
|
|
|
6d3351 |
|
|
|
6d3351 |
https://bugzilla.redhat.com/show_bug.cgi?id=1384007
|
|
|
6d3351 |
|
|
|
6d3351 |
commit a8eba5036 added further checking of the guest shutdown cause, but
|
|
|
6d3351 |
this enhancement is available since qemu 2.10, causing a crash because
|
|
|
6d3351 |
of a NULL pointer dereference on older qemus.
|
|
|
6d3351 |
|
|
|
6d3351 |
Thread 1 "libvirtd" received signal SIGSEGV, Segmentation fault.
|
|
|
6d3351 |
0x00007ffff72441af in virJSONValueObjectGet (object=0x0,
|
|
|
6d3351 |
key=0x7fffd5ef11bf "guest")
|
|
|
6d3351 |
at util/virjson.c:769
|
|
|
6d3351 |
769 if (object->type != VIR_JSON_TYPE_OBJECT)
|
|
|
6d3351 |
(gdb) bt
|
|
|
6d3351 |
0 in virJSONValueObjectGet
|
|
|
6d3351 |
1 in virJSONValueObjectGetBoolean
|
|
|
6d3351 |
2 in qemuMonitorJSONHandleShutdown
|
|
|
6d3351 |
3 in qemuMonitorJSONIOProcessEvent
|
|
|
6d3351 |
4 in qemuMonitorJSONIOProcessLine
|
|
|
6d3351 |
5 in qemuMonitorJSONIOProcess
|
|
|
6d3351 |
6 in qemuMonitorIOProcess
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
6d3351 |
(cherry picked from commit f9b69c828994ceea61759d4be43f66da67559033)
|
|
|
6d3351 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/qemu/qemu_monitor_json.c | 2 +-
|
|
|
6d3351 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
|
|
|
6d3351 |
index f22df3007..a244403b5 100644
|
|
|
6d3351 |
--- a/src/qemu/qemu_monitor_json.c
|
|
|
6d3351 |
+++ b/src/qemu/qemu_monitor_json.c
|
|
|
6d3351 |
@@ -528,7 +528,7 @@ static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr da
|
|
|
6d3351 |
bool guest = false;
|
|
|
6d3351 |
virTristateBool guest_initiated = VIR_TRISTATE_BOOL_ABSENT;
|
|
|
6d3351 |
|
|
|
6d3351 |
- if (virJSONValueObjectGetBoolean(data, "guest", &guest) == 0)
|
|
|
6d3351 |
+ if (data && virJSONValueObjectGetBoolean(data, "guest", &guest) == 0)
|
|
|
6d3351 |
guest_initiated = guest ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO;
|
|
|
6d3351 |
|
|
|
6d3351 |
qemuMonitorEmitShutdown(mon, guest_initiated);
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.13.0
|
|
|
6d3351 |
|