From 8b80eebce0b776912ca170d46282031cb0398bd4 Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Thu, 27 Mar 2014 09:50:37 +0200 Subject: [PATCH] system-monitor: oops... avoid infinite loop for multiply opened cgroups. Change-Id: Iceffd2dae6e1c8e8295e5a18f5a047ffaef4a98e --- src/plugins/system-monitor/cgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/system-monitor/cgroup.c b/src/plugins/system-monitor/cgroup.c index b300bcf..ffc7b70 100644 --- a/src/plugins/system-monitor/cgroup.c +++ b/src/plugins/system-monitor/cgroup.c @@ -441,7 +441,7 @@ static int open_controls(cgroup_t *cgrp, cgroup_type_t type, int grpflags) flags = (ctrl->flags & CONTROL_FLAG_RDONLY) ? O_RDONLY : O_RDWR; if (*fdp >= 0) - continue; + goto next; if (snprintf(path, sizeof(path), "%s/%s", cgrp->path, ctrl->path) >= (int)sizeof(path)) @@ -462,6 +462,7 @@ static int open_controls(cgroup_t *cgrp, cgroup_type_t type, int grpflags) goto retry; } + next: ctrl++; } -- 2.7.4