libvirt-9.9.0-2

Fix crash with snapshot restore (bz #2247754)
This commit is contained in:
Cole Robinson 2023-11-06 09:53:21 -05:00
parent c879325741
commit 2a7828bae8
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From: Pavel Hrdina <phrdina@redhat.com>
Date: Fri, 3 Nov 2023 14:03:55 +0100
Subject: [PATCH] qemu_process: fix crash in qemuSaveImageDecompressionStart
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Content-type: text/plain
Commit changing the code to allow passing NULL as @data into
qemuSaveImageDecompressionStart() was not correct as it left the
original call into the function as well.
Introduced-by: 2f3e582a1ac1008eba8d43c751cdba8712dd1614
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2247754
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
src/qemu/qemu_process.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 1ef032dbd2..b9267d8699 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8208,9 +8208,6 @@ qemuProcessStartWithMemoryState(virConnectPtr conn,
}
}
- if (qemuSaveImageDecompressionStart(data, fd, &intermediatefd, &errbuf, &cmd) < 0)
- return -1;
-
/* No cookie means libvirt which saved the domain was too old to mess up
* the CPU definitions.
*/

View File

@ -241,7 +241,7 @@
Summary: Library providing a simple virtualization API
Name: libvirt
Version: 9.9.0
Release: 1%{?dist}
Release: 2%{?dist}
License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1
URL: https://libvirt.org/
@ -250,6 +250,9 @@ URL: https://libvirt.org/
%endif
Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz
# Fix crash with snapshot restore (bz #2247754)
Patch0001: 0001-qemu_process-fix-crash-in-qemuSaveImageDecompression.patch
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-config-network = %{version}-%{release}
Requires: libvirt-daemon-config-nwfilter = %{version}-%{release}
@ -2500,6 +2503,9 @@ exit 0
%changelog
* Mon Nov 06 2023 Cole Robinson <crobinso@redhat.com> - 9.9.0-2
- Fix crash with snapshot restore (bz #2247754)
* Wed Nov 01 2023 Cole Robinson <crobinso@redhat.com> - 9.9.0-1
- Update to version 9.9.0