From f3b04fcd734db6fb476d268ce05a441e51710778 Mon Sep 17 00:00:00 2001
From: Michele Di Giorgio <michele.digiorgio@arm.com>
Date: Thu, 16 Nov 2017 18:26:29 +0000
Subject: [PATCH] shutils: look for an exact match of a cgroup
When running a command into a cgroup we want to make sure that the command is
only run inside the intended cgroup. If there is a hierarchy of cgroups named
with a common prefix, the script will move it to all matching cgroup and as a
result the task will end up running always at lowest level. For example, if we
have the following hierarchy of cgroups:
"/"
|__ "/tg1"
|__ "/tg1/tg1_1"
and we want to run something in cgroup "/tg1/", the lowest levels will match the
regexp and the task will ultimately be moved to "/tg1/tg1_1".
This patch fixes the issue by requiring the absolute path of the specified
cgroup to match exactly.
---
devlib/bin/scripts/shutils.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devlib/bin/scripts/shutils.in b/devlib/bin/scripts/shutils.in
index 49d7407..a58783b 100755
--- a/devlib/bin/scripts/shutils.in
+++ b/devlib/bin/scripts/shutils.in
@@ -131,7 +131,7 @@ cgroups_run_into() {
fi
$FIND $CGMOUNT -type d -mindepth 1 | \
- $GREP "$CGP" | \
+ $GREP -e "^$CGMOUNT$CGP$" | \
while read CGPATH; do
# Move this shell into that control group
echo $$ > $CGPATH/cgroup.procs