Rebased to version 1.1.3.9

CVE-2015-0236: missing ACL check for the VIR_DOMAIN_XML_SECURE flag in save images and snapshots objects (bz #1185769)
CVE-2014-8136: local denial of service in qemu/qemu_driver.c (bz #1176179)

.abignore

@@ -1,31 +0,0 @@
-[suppress_function]
-symbol_version_regexp = LIBVIRT_PRIVATE.*
-soname_regexp = libvirt\\.so.*
-
-[suppress_function]
-symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
-soname_regexp = libvirt-admin\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = LIBVIRT_PRIVATE.*
-soname_regexp = libvirt\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
-soname_regexp = libvirt-admin\\.so.*
-
-[suppress_function]
-symbol_version_regexp = .*
-soname_regexp = libvirt_storage_.*\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = .*
-soname_regexp = libvirt_storage_.*\\.so.*
-
-[suppress_function]
-symbol_version_regexp = .*
-soname_regexp = libvirt_driver_.*\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = .*
-soname_regexp = libvirt_driver_.*\\.so.*

.gitignore

@@ -2,4 +2,4 @@
 *.rpm
 i686
 x86_64
-libvirt-*.tar.xz
+libvirt-*.tar.gz

0001-util-Fix-logic-in-virFileSetCOW.patch

@@ -1,34 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 5 Aug 2020 10:01:45 +0200
-Subject: [PATCH] util: Fix logic in virFileSetCOW
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When COW is not explicitly requested to be disabled or enabled, the
-function is supposed to do nothing on non-BTRFS file systems.
-
-Fixes commit 7230bc95aa78379c9ee20cf59394c5fc4305b75b.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1866157
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 2edd63a0dbd445112db23596ee0128521e8f1ff5)
----
- src/util/virfile.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index af150421e7..a06e7dfcce 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -4550,7 +4550,7 @@ virFileSetCOW(const char *path,
-     }
- 
-     if (buf.f_type != BTRFS_SUPER_MAGIC) {
--        if (state == VIR_TRISTATE_BOOL_ABSENT) {
-+        if (state != VIR_TRISTATE_BOOL_ABSENT) {
-             virReportSystemError(ENOSYS,
-                                  _("unable to control COW flag on '%s', not btrfs"),
-                                  path);

0002-virdevmapper-Don-t-cache-device-mapper-major.patch

@@ -1,88 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 18 Aug 2020 11:08:15 +0200
-Subject: [PATCH] virdevmapper: Don't cache device-mapper major
-
-The device mapper major is needed in virIsDevMapperDevice() which
-determines whether given device is managed by device-mapper. This
-number is obtained by parsing /proc/devices and then stored in a
-global variable so that the file doesn't have to be parsed again.
-However, as it turns out this logic is flawed - the major number
-is not static and can change as it can be specified as a
-parameter when loading the dm-mod module.
-
-Unfortunately, I was not able to come up with a good solution and
-thus the /proc/devices file is being parsed every time we need
-the device mapper major.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-(cherry picked from commit 82bb167f0d15b733b23931205be3488b83cb9ec6)
----
- src/util/virdevmapper.c | 17 +++++------------
- 1 file changed, 5 insertions(+), 12 deletions(-)
-
-diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
-index a471504176..b43dbefa9a 100644
---- a/src/util/virdevmapper.c
-+++ b/src/util/virdevmapper.c
-@@ -46,11 +46,9 @@
- 
- G_STATIC_ASSERT(BUF_SIZE > sizeof(struct dm_ioctl));
- 
--static unsigned int virDMMajor;
--
- 
- static int
--virDevMapperOnceInit(void)
-+virDevMapperGetMajor(unsigned int *major)
- {
-     g_autofree char *buf = NULL;
-     VIR_AUTOSTRINGLIST lines = NULL;
-@@ -69,7 +67,7 @@ virDevMapperOnceInit(void)
- 
-         if (sscanf(lines[i], "%u %ms\n", &maj, &dev) == 2 &&
-             STREQ(dev, DM_NAME)) {
--            virDMMajor = maj;
-+            *major = maj;
-             break;
-         }
-     }
-@@ -85,9 +83,6 @@ virDevMapperOnceInit(void)
- }
- 
- 
--VIR_ONCE_GLOBAL_INIT(virDevMapper);
--
--
- static void *
- virDMIoctl(int controlFD, int cmd, struct dm_ioctl *dm, char **buf)
- {
-@@ -305,9 +300,6 @@ virDevMapperGetTargets(const char *path,
-      * consist of devices or yet another targets. If that's the
-      * case, we have to stop recursion somewhere. */
- 
--    if (virDevMapperInitialize() < 0)
--        return -1;
--
-     if ((controlFD = virDMOpen()) < 0)
-         return -1;
- 
-@@ -319,13 +311,14 @@ bool
- virIsDevMapperDevice(const char *dev_name)
- {
-     struct stat buf;
-+    unsigned int major;
- 
--    if (virDevMapperInitialize() < 0)
-+    if (virDevMapperGetMajor(&major) < 0)
-         return false;
- 
-     if (!stat(dev_name, &buf) &&
-         S_ISBLK(buf.st_mode) &&
--        major(buf.st_rdev) == virDMMajor)
-+        major(buf.st_rdev) == major)
-         return true;
- 
-     return false;

0003-virdevmapper-Handle-kernel-without-device-mapper-sup.patch

@@ -1,76 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 18 Aug 2020 11:04:24 +0200
-Subject: [PATCH] virdevmapper: Handle kernel without device-mapper support
-
-In one of my latest patch (v6.6.0~30) I was trying to remove
-libdevmapper use in favor of our own implementation. However, the
-code did not take into account that device mapper can be not
-compiled into the kernel (e.g. be a separate module that's not
-loaded) in which case /proc/devices won't have the device-mapper
-major number and thus virDevMapperGetTargets() and/or
-virIsDevMapperDevice() fails.
-
-However, such failure is safe to ignore, because if device mapper
-is missing then there can't be any multipath devices and thus we
-don't need to allow the deps in CGroups, nor create them in the
-domain private namespace, etc.
-
-Fixes: 22494556542c676d1b9e7f1c1f2ea13ac17e1e3e
-Reported-by: Andrea Bolognani <abologna@redhat.com>
-Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-(cherry picked from commit feb8564a3cc63bc8f68284063d53ec0d2d81a1cc)
----
- src/util/virdevmapper.c | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
-index b43dbefa9a..a81e2edee4 100644
---- a/src/util/virdevmapper.c
-+++ b/src/util/virdevmapper.c
-@@ -54,6 +54,9 @@ virDevMapperGetMajor(unsigned int *major)
-     VIR_AUTOSTRINGLIST lines = NULL;
-     size_t i;
- 
-+    if (!virFileExists(CONTROL_PATH))
-+        return -2;
-+
-     if (virFileReadAll(PROC_DEVICES, BUF_SIZE, &buf) < 0)
-         return -1;
- 
-@@ -126,8 +129,13 @@ virDMOpen(void)
- 
-     memset(&dm, 0, sizeof(dm));
- 
--    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0)
-+    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0) {
-+        if (errno == ENOENT)
-+            return -2;
-+
-+        virReportSystemError(errno, _("Unable to open %s"), CONTROL_PATH);
-         return -1;
-+    }
- 
-     if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) {
-         virReportSystemError(errno, "%s",
-@@ -300,8 +308,16 @@ virDevMapperGetTargets(const char *path,
-      * consist of devices or yet another targets. If that's the
-      * case, we have to stop recursion somewhere. */
- 
--    if ((controlFD = virDMOpen()) < 0)
-+    if ((controlFD = virDMOpen()) < 0) {
-+        if (controlFD == -2) {
-+            /* The CONTROL_PATH doesn't exist. Probably the
-+             * module isn't loaded, yet. Don't error out, just
-+             * exit. */
-+            return 0;
-+        }
-+
-         return -1;
-+    }
- 
-     return virDevMapperGetTargetsImpl(controlFD, path, devPaths, ttl);
- }

0004-virdevmapper-Ignore-all-errors-when-opening-dev-mapp.patch

@@ -1,77 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 19 Aug 2020 13:35:55 +0200
-Subject: [PATCH] virdevmapper: Ignore all errors when opening
- /dev/mapper/control
-
-So far, only ENOENT is ignored (to deal with kernels without
-devmapper). However, as reported on the list, under certain
-scenarios a different error can occur. For instance, when libvirt
-is running inside a container which doesn't have permissions to
-talk to the devmapper. If this is the case, then open() returns
--1 and sets errno=EPERM.
-
-Assuming that multipath devices are fairly narrow use case and
-using them in a restricted container is even more narrow the best
-fix seems to be to ignore all open errors BUT produce a warning
-on failure. To avoid flooding logs with warnings on kernels
-without devmapper the level is reduced to a plain debug message.
-
-Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 53d9af1e7924757e3b5f661131dd707d7110d094)
----
- src/util/virdevmapper.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
-index a81e2edee4..ee2fab5ae3 100644
---- a/src/util/virdevmapper.c
-+++ b/src/util/virdevmapper.c
-@@ -35,9 +35,12 @@
- # include "viralloc.h"
- # include "virstring.h"
- # include "virfile.h"
-+# include "virlog.h"
- 
- # define VIR_FROM_THIS VIR_FROM_STORAGE
- 
-+VIR_LOG_INIT("util.virdevmapper");
-+
- # define PROC_DEVICES "/proc/devices"
- # define DM_NAME "device-mapper"
- # define DEV_DM_DIR "/dev/" DM_DIR
-@@ -130,11 +133,15 @@ virDMOpen(void)
-     memset(&dm, 0, sizeof(dm));
- 
-     if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0) {
--        if (errno == ENOENT)
--            return -2;
--
--        virReportSystemError(errno, _("Unable to open %s"), CONTROL_PATH);
--        return -1;
-+        /* We can't talk to devmapper. Produce a warning and let
-+         * the caller decide what to do next. */
-+        if (errno == ENOENT) {
-+            VIR_DEBUG("device mapper not available");
-+        } else {
-+            VIR_WARN("unable to open %s: %s",
-+                     CONTROL_PATH, g_strerror(errno));
-+        }
-+        return -2;
-     }
- 
-     if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) {
-@@ -310,9 +317,9 @@ virDevMapperGetTargets(const char *path,
- 
-     if ((controlFD = virDMOpen()) < 0) {
-         if (controlFD == -2) {
--            /* The CONTROL_PATH doesn't exist. Probably the
--             * module isn't loaded, yet. Don't error out, just
--             * exit. */
-+            /* The CONTROL_PATH doesn't exist or is unusable.
-+             * Probably the module isn't loaded, yet. Don't error
-+             * out, just exit. */
-             return 0;
-         }
- 

0005-util-use-g_autofree-in-virSCSIHostGetUniqueId.patch

@@ -1,57 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Wed, 4 Nov 2020 12:08:19 +0100
-Subject: [PATCH] util: use g_autofree in virSCSIHostGetUniqueId
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 843b70995471c1a20822ee62ff084310066b4b4a)
----
- src/util/virscsihost.c | 16 +++++-----------
- 1 file changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c
-index 7d8e5299b8..4e6d8f7ad6 100644
---- a/src/util/virscsihost.c
-+++ b/src/util/virscsihost.c
-@@ -46,17 +46,16 @@ int
- virSCSIHostGetUniqueId(const char *sysfs_prefix,
-                        int host)
- {
--    char *sysfs_path = NULL;
-+    g_autofree char *sysfs_path = NULL;
-     char *p = NULL;
--    int ret = -1;
--    char *buf = NULL;
-+    g_autofree char *buf = NULL;
-     int unique_id;
- 
-     sysfs_path = g_strdup_printf("%s/host%d/unique_id",
-                                  sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host);
- 
-     if (virFileReadAll(sysfs_path, 1024, &buf) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if ((p = strchr(buf, '\n')))
-         *p = '\0';
-@@ -65,15 +64,10 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix,
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("unable to parse unique_id: %s"), buf);
- 
--        goto cleanup;
-+        return -1;
-     }
- 
--    ret = unique_id;
--
-- cleanup:
--    VIR_FREE(sysfs_path);
--    VIR_FREE(buf);
--    return ret;
-+    return unique_id;
- }
- 
- 

0006-util-quieten-virSCSIHostGetUniqueId.patch

@@ -1,56 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Wed, 4 Nov 2020 12:29:07 +0100
-Subject: [PATCH] util: quieten virSCSIHostGetUniqueId
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The only caller of this function ignores failure
-and just sets the unique_id to -1.
-
-Failing to read the file is likely to the device no longer
-being present, not a real error.
-
-Stop reporting errors in this function.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1692100
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 4a56278e770c972dbee7be5842b557de152a586e)
----
- src/util/virscsihost.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c
-index 4e6d8f7ad6..b1d51b40d3 100644
---- a/src/util/virscsihost.c
-+++ b/src/util/virscsihost.c
-@@ -41,6 +41,8 @@ VIR_LOG_INIT("util.scsi_host");
-  * Read the value of the "scsi_host" unique_id file.
-  *
-  * Returns the value on success or -1 on failure.
-+ *
-+ * No errors are reported.
-  */
- int
- virSCSIHostGetUniqueId(const char *sysfs_prefix,
-@@ -54,16 +56,14 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix,
-     sysfs_path = g_strdup_printf("%s/host%d/unique_id",
-                                  sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host);
- 
--    if (virFileReadAll(sysfs_path, 1024, &buf) < 0)
-+    if (virFileReadAllQuiet(sysfs_path, 1024, &buf) < 0)
-         return -1;
- 
-     if ((p = strchr(buf, '\n')))
-         *p = '\0';
- 
-     if (virStrToLong_i(buf, NULL, 10, &unique_id) < 0) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("unable to parse unique_id: %s"), buf);
--
-+        VIR_DEBUG("unable to parse unique_id: '%s'", buf);
-         return -1;
-     }
- 

0007-node_device-Use-udev-monitor-source.patch

@@ -1,46 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 17 Nov 2020 12:56:39 +0100
-Subject: [PATCH] node_device: Use "udev" monitor source
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In v6.3.0-rc1~67 I've made a switch: instead of listening on udev
-events the nodedev driver started listening for kernel events.
-This was because when a device changes its name (e.g. NICs) we
-will get "move" event with DEVPATH_OLD property set, which we can
-then use to remove the old device and thus keep our internal list
-up to date. The switch to "kernel" source was made because if the
-old NICs naming (eth0, eth1, ...) is enabled (e.g. via
-net.ifnames=0 on the kernel cmd line) then udev overwrites the
-property with the new name making our internal list go out of
-sync. Interestingly, when the od NICs naming is not enabled then
-the DEVPATH_OLD contains the correct value.
-
-But as it turns out, "kernel" source might be missing some other
-important properties, e.g. USB vendor/product IDs. Therefore,
-switch back to "udev" source and wish the best of luck to users
-using the old NICs naming.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1897625
-Fixes: 9a13704818e4a018723e0ec5b9e97b176f1c8584
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 7e67a136dab9034dd3cb2ed76fa90c524c800cde)
----
- src/node_device/node_device_udev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index ff558efb83..b7fbd42fa1 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -1878,7 +1878,7 @@ nodeStateInitialize(bool privileged,
- 
-     virObjectLock(priv);
- 
--    priv->udev_monitor = udev_monitor_new_from_netlink(udev, "kernel");
-+    priv->udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
-     if (!priv->udev_monitor) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("udev_monitor_new_from_netlink returned NULL"));

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: libvirt
+# $Id$
+NAME := libvirt
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-SHA512 (libvirt-6.6.0.tar.xz) = 55091addcf43d3c0bdd50f9378b588351181d191272d5a19220a0babe0893c1f6e0f1e41a7f51b8c1fb8e2098236b273e1a18b81573f4008ee3cf65374ba9465
+e345a41ac10324cbb789387381f07564  libvirt-1.1.3.9.tar.gz