Merge ~paelzer/ubuntu/+source/qemu:lp-1878973-qga-assert-EOAN into ubuntu/+source/qemu:ubuntu/eoan-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4100

[Rafael David Tinoco (rafaeldtinoco)]

Quick approval for a simple fix. Not testing install/upgrade paths.

+1

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks, tagged and uploaded to -unapproved

[Christian Ehrhardt  (paelzer)]

accepted into -proposed

diff --git a/debian/changelog b/debian/changelog
index 4450378..a51cec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qemu (1:4.0+dfsg-0ubuntu9.8) eoan; urgency=medium
+
+  * debian/patches/ubuntu/lp-1878973-*: fix assert in qemu-guest-agent that
+    crashes it on shutdown (LP: #1878973)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 02 Jun 2020 10:42:49 +0200
+
 qemu (1:4.0+dfsg-0ubuntu9.7) eoan; urgency=medium
 
   * d/p/ubuntu/lp-1805256*: Fixes for QEMU on aarch64 ARM hosts
diff --git a/debian/patches/series b/debian/patches/series
index 43a5b90..0ab2ff2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -54,3 +54,4 @@ ubuntu/CVE-2020-10702.patch
 ubuntu/CVE-2020-1983.patch
 ubuntu/lp-1805256-async_use_explicit_mem_barriers.patch
 ubuntu/lp-1805256-aio-wait_delegate_poll_aioctx_bql.patch
+ubuntu/lp-1878973-fix-assert-regression.patch
diff --git a/debian/patches/ubuntu/lp-1878973-fix-assert-regression.patch b/debian/patches/ubuntu/lp-1878973-fix-assert-regression.patch
 new file mode 100644
index 0000000..4d72c0b
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1878973-fix-assert-regression.patch
@@ -0,0 +1,41 @@
+qga: fix assert regression on guest-shutdown
+From:	Marc-André Lureau
+Subject:	[PATCH] qga: fix assert regression on guest-shutdown
+Date:	Thu, 4 Jun 2020 11:44:25 +0200
+
+Since commit 781f2b3d1e ("qga: process_event() simplification"),
+send_response() is called unconditionally, but will assert when "rsp" is
+NULL. This may happen with QCO_NO_SUCCESS_RESP commands, such as
+"guest-shutdown".
+
+Fixes: 781f2b3d1e5ef389b44016a897fd55e7a780bf35
+Cc: Michael Roth <[e-mail]>
+Reported-by: Christian Ehrhardt <[e-mail]>
+Signed-off-by: Marc-André Lureau <[e-mail]>
+
+Origin: upstream, https://lists.nongnu.org/archive/html/qemu-devel/2020-06/msg00962.html
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1878973
+Last-Update: 2020-06-09
+---
+ qga/main.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/qga/main.c b/qga/main.c
+index f0e454f28d3..3febf3b0fdf 100644
+--- a/qga/main.c
++++ b/qga/main.c
+@@ -531,7 +531,11 @@ static int send_response(GAState *s, const QDict *rsp)
+     QString *payload_qstr, *response_qstr;
+     GIOStatus status;
+ 
+-    g_assert(rsp && s->channel);
++    g_assert(s->channel);
++
++    if (!rsp) {
++        return 0;
++    }
+ 
+     payload_qstr = qobject_to_json(QOBJECT(rsp));
+     if (!payload_qstr) {
+-- 
+2.26.2.561.g07d8ea56f2