summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAlban Crequy <alban.crequy@collabora.co.uk>2014-08-18 12:20:20 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-05 13:41:03 -0700
commit767f5ccd772e406f493e85edcb3503e4ef8d1ca7 (patch)
tree52c306e05546f91f3aae537ddd702dcc725ccf32 /kernel
parent6ea8d7ba04553016f90773ca333dc424be8770c6 (diff)
cgroup: reject cgroup names with '\n'
commit 71b1fb5c4473a5b1e601d41b109bdfe001ec82e0 upstream. /proc/<pid>/cgroup contains one cgroup path on each line. If cgroup names are allowed to contain "\n", applications cannot parse /proc/<pid>/cgroup safely. Signed-off-by: Alban Crequy <alban.crequy@collabora.co.uk> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 3bb40d98a892..c89e9a9049f4 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -4393,6 +4393,11 @@ static int cgroup_mkdir(struct kernfs_node *parent_kn, const char *name,
struct kernfs_node *kn;
int ssid, ret;
+ /* Do not accept '\n' to prevent making /proc/<pid>/cgroup unparsable.
+ */
+ if (strchr(name, '\n'))
+ return -EINVAL;
+
parent = cgroup_kn_lock_live(parent_kn);
if (!parent)
return -ENODEV;