path: root/kernel
diff options
authorLinus Torvalds <>2021-06-10 12:01:22 -0700
committerLinus Torvalds <>2021-06-10 12:01:22 -0700
commitf09eacca59d27efc15001795c33dbc78ca070732 (patch)
tree99f3629238d8fb1a2966df5585aef676e9abcd59 /kernel
parent29a877d5768471c5ed97ea967c0ee9436b8c03fc (diff)
parentb7e24eb1caa5f8da20d405d262dba67943aedc42 (diff)
Merge branch 'for-5.13-fixes' of git://
Pull cgroup fix from Tejun Heo: "This is a high priority but low risk fix for a cgroup1 bug where rename(2) can change a cgroup's name to something which can break parsing of /proc/PID/cgroup" * 'for-5.13-fixes' of git:// cgroup1: don't allow '\n' in renaming
Diffstat (limited to 'kernel')
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index 8190b6bfc978..1f274d7fc934 100644
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -820,6 +820,10 @@ static int cgroup1_rename(struct kernfs_node *kn, struct kernfs_node *new_parent
struct cgroup *cgrp = kn->priv;
int ret;
+ /* do not accept '\n' to prevent making /proc/<pid>/cgroup unparsable */
+ if (strchr(new_name_str, '\n'))
+ return -EINVAL;
if (kernfs_type(kn) != KERNFS_DIR)
return -ENOTDIR;
if (kn->parent != new_parent)