2014-08-08 17:04:43 +02:00
|
|
|
From 475b272c126d53f3985860422dc96b01b470423e Mon Sep 17 00:00:00 2001
|
|
|
|
From: Chunyan Liu <cyliu@suse.com>
|
|
|
|
Date: Tue, 29 Jul 2014 17:31:28 +0800
|
|
|
|
Subject: [PATCH] blockcopy: check dst = identical device
|
|
|
|
|
|
|
|
Check whether dst is the same device as source, if yes, report
|
|
|
|
error and exit.
|
|
|
|
|
|
|
|
Signed-off-by: Chunyan Liu <cyliu@suse.com>
|
|
|
|
---
|
|
|
|
src/qemu/qemu_driver.c | 7 +++++++
|
|
|
|
1 file changed, 7 insertions(+)
|
|
|
|
|
Accepting request 692393 from home:jfehlig:branches:Virtualization
- CVE-2019-3886: disallow virDomainGetHostname and virDomainGetTime
for read-only connections and users
CVE-2019-3886-api.patch, CVE-2019-3886-remote.patch
bsc#1131595
- spec: BuildRequires rpcgen since CVE-2019-3886-remote.patch
touches remote_protocol.x
- Update to libvirt 5.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
4ec3cf9a-apparmor-rules.patch,
f38ef0fa-no-RDMA-check.patch,
411cdaf8-apparmor-check-profile-name.patch,
696239ba-qemu-fix-query-cpus-fast.patch,
09eb1ae0-conf-add-xenbus-controller.patch,
fb059757-libxl-add-xenbus-controller.patch,
ec5a1191-libxl-support-max-grant-frames.patch,
5a64c202-xenconfig-support-max-grant-frames.patch
- Added patches:
ff376c62-tests-fix-mocking-stat-lstat.patch,
mprivozn-test-fix-proposal.patch
OBS-URL: https://build.opensuse.org/request/show/692393
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=745
2019-04-09 00:27:41 +02:00
|
|
|
Index: libvirt-5.2.0/src/qemu/qemu_driver.c
|
2014-08-08 17:04:43 +02:00
|
|
|
===================================================================
|
Accepting request 692393 from home:jfehlig:branches:Virtualization
- CVE-2019-3886: disallow virDomainGetHostname and virDomainGetTime
for read-only connections and users
CVE-2019-3886-api.patch, CVE-2019-3886-remote.patch
bsc#1131595
- spec: BuildRequires rpcgen since CVE-2019-3886-remote.patch
touches remote_protocol.x
- Update to libvirt 5.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
4ec3cf9a-apparmor-rules.patch,
f38ef0fa-no-RDMA-check.patch,
411cdaf8-apparmor-check-profile-name.patch,
696239ba-qemu-fix-query-cpus-fast.patch,
09eb1ae0-conf-add-xenbus-controller.patch,
fb059757-libxl-add-xenbus-controller.patch,
ec5a1191-libxl-support-max-grant-frames.patch,
5a64c202-xenconfig-support-max-grant-frames.patch
- Added patches:
ff376c62-tests-fix-mocking-stat-lstat.patch,
mprivozn-test-fix-proposal.patch
OBS-URL: https://build.opensuse.org/request/show/692393
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=745
2019-04-09 00:27:41 +02:00
|
|
|
--- libvirt-5.2.0.orig/src/qemu/qemu_driver.c
|
|
|
|
+++ libvirt-5.2.0/src/qemu/qemu_driver.c
|
|
|
|
@@ -17735,6 +17735,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
|
2015-04-02 18:20:09 +02:00
|
|
|
goto endjob;
|
2014-08-08 17:04:43 +02:00
|
|
|
}
|
2017-08-03 19:28:59 +02:00
|
|
|
|
2014-10-02 00:29:37 +02:00
|
|
|
+ if (STREQ_NULLABLE(realpath(disk->src->path, NULL),
|
|
|
|
+ realpath(mirror->path, NULL))) {
|
2014-08-08 17:04:43 +02:00
|
|
|
+ virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
+ _("destination '%s' is the same as disk '%s' source"),
|
2014-10-02 00:29:37 +02:00
|
|
|
+ mirror->path, path);
|
2014-08-08 17:04:43 +02:00
|
|
|
+ goto endjob;
|
|
|
|
+ }
|
|
|
|
+
|
2017-12-01 23:52:01 +01:00
|
|
|
if (qemuDomainStorageFileInit(driver, vm, mirror, NULL) < 0)
|
2017-08-03 19:28:59 +02:00
|
|
|
goto endjob;
|
|
|
|
|