From: Tejun Heo <tj@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org
Subject: [GIT PULL] cgroup fixes for v5.13-rc5
Date: Thu, 10 Jun 2021 10:26:06 -0400 [thread overview]
Message-ID: <YMIg/rC1TQwEbabA@slm.duckdns.org> (raw)
Hello, Linus.
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.
Thanks.
The following changes since commit 08b2b6fdf6b26032f025084ce2893924a0cdb4a2:
cgroup: fix spelling mistakes (2021-05-24 12:45:26 -0400)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git for-5.13-fixes
for you to fetch changes up to b7e24eb1caa5f8da20d405d262dba67943aedc42:
cgroup1: don't allow '\n' in renaming (2021-06-10 09:58:50 -0400)
----------------------------------------------------------------
Alexander Kuznetsov (1):
cgroup1: don't allow '\n' in renaming
kernel/cgroup/cgroup-v1.c | 4 ++++
1 file changed, 4 insertions(+)
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)
WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Linus Torvalds
<torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [GIT PULL] cgroup fixes for v5.13-rc5
Date: Thu, 10 Jun 2021 10:26:06 -0400 [thread overview]
Message-ID: <YMIg/rC1TQwEbabA@slm.duckdns.org> (raw)
Hello, Linus.
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.
Thanks.
The following changes since commit 08b2b6fdf6b26032f025084ce2893924a0cdb4a2:
cgroup: fix spelling mistakes (2021-05-24 12:45:26 -0400)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git for-5.13-fixes
for you to fetch changes up to b7e24eb1caa5f8da20d405d262dba67943aedc42:
cgroup1: don't allow '\n' in renaming (2021-06-10 09:58:50 -0400)
----------------------------------------------------------------
Alexander Kuznetsov (1):
cgroup1: don't allow '\n' in renaming
kernel/cgroup/cgroup-v1.c | 4 ++++
1 file changed, 4 insertions(+)
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)
next reply other threads:[~2021-06-10 14:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 14:26 Tejun Heo [this message]
2021-06-10 14:26 ` [GIT PULL] cgroup fixes for v5.13-rc5 Tejun Heo
2021-06-10 19:18 ` pr-tracker-bot
2021-06-10 19:18 ` pr-tracker-bot-DgEjT+Ai2ygdnm+yROfE0A
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YMIg/rC1TQwEbabA@slm.duckdns.org \
--to=tj@kernel.org \
--cc=cgroups@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.