06949b0f82
- Get /proc/sys/net/ipv[46] read-write for wicked to work in containers. bsc#904432. ba9b7252-sys-net-rw.patch - Fixed allowing devices for containers. cgroup-all-devices.patch OBS-URL: https://build.opensuse.org/request/show/264662 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=426
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From c3cebcbf0303af428f75c53de99d75885b8a8ce3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
|
|
Date: Wed, 10 Dec 2014 14:32:10 +0100
|
|
Subject: [PATCH] Avoid getting '-1:-1' in devices cgroup list
|
|
|
|
When calling virCgroupAllowAllDevices we get these invalid entries
|
|
in the device cgroup config.
|
|
b -1:-1 rw
|
|
c -1:-1 rw
|
|
Check for positive values before outputting the major and minor to
|
|
avoid that.
|
|
---
|
|
src/util/vircgroup.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
|
|
index 166f4dc..3995477 100644
|
|
--- a/src/util/vircgroup.c
|
|
+++ b/src/util/vircgroup.c
|
|
@@ -2767,11 +2767,11 @@ virCgroupAllowDevice(virCgroupPtr group, char type, int major, int minor,
|
|
char *minorstr = NULL;
|
|
|
|
if ((major < 0 && VIR_STRDUP(majorstr, "*") < 0) ||
|
|
- virAsprintf(&majorstr, "%i", major) < 0)
|
|
+ (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0))
|
|
goto cleanup;
|
|
|
|
if ((minor < 0 && VIR_STRDUP(minorstr, "*") < 0) ||
|
|
- virAsprintf(&minorstr, "%i", minor) < 0)
|
|
+ (minor >= 0 && virAsprintf(&minorstr, "%i", minor) < 0))
|
|
goto cleanup;
|
|
|
|
if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr,
|
|
--
|
|
2.1.2
|
|
|