From: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Date: Fri, 11 Oct 2013 13:41:24 +0000 (+0800)
Subject: cgroup: leave blkio cgroup value checking to kernel
X-Git-Tag: CVE-2013-4401~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=521cec2aab121e04599127918fe7348353224976;p=thirdparty%2Flibvirt.git

cgroup: leave blkio cgroup value checking to kernel

The range of valid values for cgroup tunables has
changed in the past and may change again in future
kernels. Avoid hardcoding range checks in libvirt
code, delegating range checking to the kernel itself.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
---

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 7a85000f63..5c43e107ad 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -1796,13 +1796,6 @@ virCgroupPathOfController(virCgroupPtr group,
 int
 virCgroupSetBlkioWeight(virCgroupPtr group, unsigned int weight)
 {
-    if (weight > 1000 || weight < 100) {
-        virReportError(VIR_ERR_INVALID_ARG,
-                       _("weight '%u' must be in range (100, 1000)"),
-                       weight);
-        return -1;
-    }
-
     return virCgroupSetValueU64(group,
                                 VIR_CGROUP_CONTROLLER_BLKIO,
                                 "blkio.weight",
@@ -1854,13 +1847,6 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group,
     struct stat sb;
     int ret;
 
-    if (weight && (weight > 1000 || weight < 100)) {
-        virReportError(VIR_ERR_INVALID_ARG,
-                       _("weight '%u' must be in range (100, 1000)"),
-                       weight);
-        return -1;
-    }
-
     if (stat(path, &sb) < 0) {
         virReportSystemError(errno,
                              _("Path '%s' is not accessible"),