[Pkg-libvirt-commits] [libvirt] 05/10: qemu: Fix crash in tunnelled migration

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.2.9-7
in repository libvirt.

commit 5aaafc92debca852546b7d3c69296b89040d5aa0
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Dec 24 09:42:05 2014 +0100

    qemu: Fix crash in tunnelled migration
    
    Closes: #773503
---
 debian/patches/series                              |  1 +
 .../qemu-Fix-crash-in-tunnelled-migration.patch    | 32 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 2b22fe7..aedd174 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ security/CVE-2014-8131-Fix-possible-deadlock-and-segfault-in-.patch
 qemu-bulk-stats-Fix-logic-in-monitor-handling.patch
 security/CVE-2014-8135-storage-fix-crash-caused-by-no-check-r.patch
 security/CVE-2014-8136-qemu-migration-Unlock-vm-on-failed-ACL.patch
+upstream/qemu-Fix-crash-in-tunnelled-migration.patch
diff --git a/debian/patches/upstream/qemu-Fix-crash-in-tunnelled-migration.patch b/debian/patches/upstream/qemu-Fix-crash-in-tunnelled-migration.patch
new file mode 100644
index 0000000..c7e0e13
--- /dev/null
+++ b/debian/patches/upstream/qemu-Fix-crash-in-tunnelled-migration.patch
@@ -0,0 +1,32 @@
+From: Jiri Denemark <jdenemar at redhat.com>
+Date: Thu, 20 Nov 2014 13:09:16 +0100
+Subject: qemu: Fix crash in tunnelled migration
+
+Any attempt to start a tunnelled migration with libvirtd that supports
+RDMA migration (specifically commit v1.2.8-226-ged22a47) crashes
+libvirtd on the destination host.
+
+The crash is inevitable because qemuMigrationPrepareAny is always called
+with NULL protocol in case of tunnelled migration.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1147331
+Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
+
+Closes: #773503
+---
+ src/qemu/qemu_migration.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
+index 284cd5a..e18556f 100644
+--- a/src/qemu/qemu_migration.c
++++ b/src/qemu/qemu_migration.c
+@@ -2696,7 +2696,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
+                                        QEMU_MIGRATION_COOKIE_NBD)))
+         goto cleanup;
+ 
+-    if (STREQ(protocol, "rdma") && !vm->def->mem.hard_limit) {
++    if (STREQ_NULLABLE(protocol, "rdma") && !vm->def->mem.hard_limit) {
+         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
+                        _("cannot start RDMA migration with no memory hard "
+                          "limit set"));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git