Hello community, here is the log from the commit of package runc for openSUSE:Factory checked in at 2017-04-17 10:26:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/runc (Old) and /work/SRC/openSUSE:Factory/.runc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "runc" Mon Apr 17 10:26:20 2017 rev:11 rq:487329 version:0.1.1+gitr2942_2f7393a Changes: -------- --- /work/SRC/openSUSE:Factory/runc/runc.changes 2017-03-12 20:05:55.749378120 +0100 +++ /work/SRC/openSUSE:Factory/.runc.new/runc.changes 2017-04-17 10:26:23.213571574 +0200 @@ -1,0 +2,7 @@ +Wed Mar 29 15:47:52 UTC 2017 - jmassaguer...@suse.com + +- fix bsc#1028113 - runc: make sure to ignore cgroup v2 mountpoints + This is a backport of https://github.com/opencontainers/runc/pull/1266 + + ignore_cgroup2_mountpoint.patch + +------------------------------------------------------------------- New: ---- ignore_cgroup2_mountpoint.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ runc.spec ++++++ --- /var/tmp/diff_new_pack.PvApuC/_old 2017-04-17 10:26:24.037454897 +0200 +++ /var/tmp/diff_new_pack.PvApuC/_new 2017-04-17 10:26:24.041454331 +0200 @@ -58,6 +58,7 @@ Url: https://github.com/opencontainers/runc Source: %{name}-git.%{git_version}.tar.xz Patch0: CVE-2016-9962.patch +Patch1: ignore_cgroup2_mountpoint.patch BuildRequires: fdupes %ifarch %go_arches BuildRequires: go >= 1.5 @@ -104,6 +105,9 @@ %prep %setup -q -n %{name}-git.%{git_version} %patch0 -p1 +%if 0%{?suse_version} > 1320 +%patch1 -p1 +%endif %build # Do not use symlinks. If you want to run the unit tests for this package at ++++++ ignore_cgroup2_mountpoint.patch ++++++ >From e7b57cb042130edf86506d189734018edc3f2c18 Mon Sep 17 00:00:00 2001 From: Mrunal Patel <mrun...@gmail.com> Date: Tue, 10 Jan 2017 15:13:28 -0800 Subject: [PATCH] Ignore cgroup2 mountpoints Our current cgroup parsing logic assumes cgroup v1 mounts so we should ignore cgroup2 mounts for now Backport: https://github.com/opencontainers/runc/pull/1266 Signed-off-by: Mrunal Patel <mrun...@gmail.com> Signed-off-by: Aleksa Sarai <asa...@suse.de> --- libcontainer/cgroups/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcontainer/cgroups/utils.go b/libcontainer/cgroups/utils.go index 8946dd5959e4..c6db0039e654 100644 --- a/libcontainer/cgroups/utils.go +++ b/libcontainer/cgroups/utils.go @@ -149,7 +149,7 @@ func getCgroupMountsHelper(ss map[string]bool, mi io.Reader, all bool) ([]Mount, if sepIdx == -1 { return nil, fmt.Errorf("invalid mountinfo format") } - if txt[sepIdx+3:sepIdx+9] != "cgroup" { + if txt[sepIdx+3:sepIdx+10] == "cgroup2" || txt[sepIdx+3:sepIdx+9] != "cgroup" { continue } fields := strings.Split(txt, " ") -- 2.12.2
