|
 |
99cbc7 |
From 02683e9bc2ec38c7b7fb2ec2bba789701c514ddc Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <02683e9bc2ec38c7b7fb2ec2bba789701c514ddc@dist-git>
|
|
|
99cbc7 |
From: John Ferlan <jferlan@redhat.com>
|
|
|
99cbc7 |
Date: Thu, 10 Jan 2019 12:49:10 +0100
|
|
|
99cbc7 |
Subject: [PATCH] qemu: Remove duplicated qemuAgentCheckError
|
|
|
99cbc7 |
MIME-Version: 1.0
|
|
|
99cbc7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
99cbc7 |
Content-Transfer-Encoding: 8bit
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Commit 5b3492fadb moved qemuAgentCheckError calls into
|
|
|
99cbc7 |
qemuAgentCommand for various reasons; however, subsequent
|
|
|
99cbc7 |
commit 0977b8aa0 adding a new command made call again
|
|
|
99cbc7 |
So let's just remove the duplicitous call from
|
|
|
99cbc7 |
qemuAgentGetInterfaces.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
|
|
99cbc7 |
ACKed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit 9ed175fbc2deecfdaeabca7bc77c7e7ae33a3377)
|
|
|
99cbc7 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
99cbc7 |
|
|
|
99cbc7 |
7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1663051
|
|
|
99cbc7 |
8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1665000
|
|
|
99cbc7 |
CVE-2019-3840
|
|
|
99cbc7 |
Message-Id: <14650d570abb94757791fcdb50b65d65bb8d5601.1547120910.git.jtomko@redhat.com>
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
src/qemu/qemu_agent.c | 5 ++---
|
|
|
99cbc7 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
|
|
|
99cbc7 |
index 10c6ef09fa..986e37b07d 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_agent.c
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_agent.c
|
|
|
99cbc7 |
@@ -1987,10 +1987,9 @@ qemuAgentGetInterfaces(qemuAgentPtr mon,
|
|
|
99cbc7 |
if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL)))
|
|
|
99cbc7 |
goto cleanup;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
- if (qemuAgentCommand(mon, cmd, &reply, false, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 ||
|
|
|
99cbc7 |
- qemuAgentCheckError(cmd, reply) < 0) {
|
|
|
99cbc7 |
+ if (qemuAgentCommand(mon, cmd, &reply, false,
|
|
|
99cbc7 |
+ VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
|
|
|
99cbc7 |
goto cleanup;
|
|
|
99cbc7 |
- }
|
|
|
99cbc7 |
|
|
|
99cbc7 |
if (!(ret_array = virJSONValueObjectGet(reply, "return"))) {
|
|
|
99cbc7 |
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.21.0
|
|
|
99cbc7 |
|