Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame^] | 1 | From 74bff2509080912ea8abf1de8fd95fa2412b659a Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com> |
| 3 | Date: Thu, 11 Apr 2013 11:37:25 +0200 |
| 4 | Subject: [PATCH] qemu: fix crash in qemuOpen |
| 5 | |
| 6 | commit 74bff2509080912ea8abf1de8fd95fa2412b659a from upsteam |
| 7 | git://libvirt.org/libvirt.git |
| 8 | |
| 9 | If the path part of connection URI is not present, cfg is used |
| 10 | unitialized. |
| 11 | |
| 12 | https://bugzilla.redhat.com/show_bug.cgi?id=950855 |
| 13 | --- |
| 14 | src/qemu/qemu_driver.c | 2 +- |
| 15 | 1 files changed, 1 insertions(+), 1 deletions(-) |
| 16 | |
| 17 | diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c |
| 18 | index 2c0d7d1..0d41e39 100644 |
| 19 | --- a/src/qemu/qemu_driver.c |
| 20 | +++ b/src/qemu/qemu_driver.c |
| 21 | @@ -1026,6 +1026,7 @@ static virDrvOpenStatus qemuOpen(virConnectPtr conn, |
| 22 | goto cleanup; |
| 23 | } |
| 24 | |
| 25 | + cfg = virQEMUDriverGetConfig(qemu_driver); |
| 26 | if (conn->uri->path == NULL) { |
| 27 | virReportError(VIR_ERR_INTERNAL_ERROR, |
| 28 | _("no QEMU URI path given, try %s"), |
| 29 | @@ -1033,7 +1034,6 @@ static virDrvOpenStatus qemuOpen(virConnectPtr conn, |
| 30 | goto cleanup; |
| 31 | } |
| 32 | |
| 33 | - cfg = virQEMUDriverGetConfig(qemu_driver); |
| 34 | if (cfg->privileged) { |
| 35 | if (STRNEQ(conn->uri->path, "/system") && |
| 36 | STRNEQ(conn->uri->path, "/session")) { |
| 37 | -- |
| 38 | 1.7.1 |
| 39 | |