From: Aleksa Sarai <cyphar-gVpy/LI/lHzQT0dZR+AlfA@public.gmane.org>
To: tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Aleksa Sarai <cyphar-gVpy/LI/lHzQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH 1/2] cgroup: get a ref to source csses when migrating
Date: Sun, 23 Aug 2015 23:10:31 +1000 [thread overview]
Message-ID: <1440335432-4202-2-git-send-email-cyphar@cyphar.com> (raw)
In-Reply-To: <1440335432-4202-1-git-send-email-cyphar-gVpy/LI/lHzQT0dZR+AlfA@public.gmane.org>
Grab a ref to each source css being migrated from, otherwise it's
possible for the refcount to reach zero between ->can_attach() and
->cancel_attach(). This means that operations on the task's old css
(such as container_of(...)) become unsafe, as we may be operating on a
different css.
Signed-off-by: Aleksa Sarai <cyphar-gVpy/LI/lHzQT0dZR+AlfA@public.gmane.org>
---
kernel/cgroup.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 4ec1b7ee5de8..6cbfbe36284d 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2305,6 +2305,17 @@ static int cgroup_migrate(struct cgroup *cgrp, struct task_struct *leader,
if (list_empty(&tset.src_csets))
return 0;
+ /*
+ * Fetch a ref of each css, so that the old task's css doesn't get reaped
+ * between ->can_attach() and ->cancel_attach().
+ */
+ down_read(&css_set_rwsem);
+ list_for_each_entry(cset, &tset.src_csets, mg_node) {
+ for_each_e_css(css, i, cgrp)
+ css_get(cset->subsys[i]);
+ }
+ up_read(&css_set_rwsem);
+
/* check that we can legitimately attach to the cgroup */
for_each_e_css(css, i, cgrp) {
if (css->ss->can_attach) {
@@ -2341,7 +2352,7 @@ static int cgroup_migrate(struct cgroup *cgrp, struct task_struct *leader,
css->ss->attach(css, &tset);
ret = 0;
- goto out_release_tset;
+ goto out_deref_src;
out_cancel_attach:
for_each_e_css(css, i, cgrp) {
@@ -2350,7 +2361,13 @@ out_cancel_attach:
if (css->ss->cancel_attach)
css->ss->cancel_attach(css, &tset);
}
-out_release_tset:
+out_deref_src:
+ down_read(&css_set_rwsem);
+ list_for_each_entry(cset, &tset.src_csets, mg_node) {
+ for_each_e_css(css, i, cgrp)
+ css_put(cset->subsys[i]);
+ }
+ up_read(&css_set_rwsem);
down_write(&css_set_rwsem);
list_splice_init(&tset.dst_csets, &tset.src_csets);
list_for_each_entry_safe(cset, tmp_cset, &tset.src_csets, mg_node) {
--
2.5.0
next prev parent reply other threads:[~2015-08-23 13:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-23 12:24 Bad Reference Semantics in PIDs Controller Aleksa Sarai
2015-08-23 13:10 ` [PATCH 0/2] cgroup: pids: fix invalid reference semantics Aleksa Sarai
[not found] ` <1440335432-4202-1-git-send-email-cyphar-gVpy/LI/lHzQT0dZR+AlfA@public.gmane.org>
2015-08-23 13:10 ` Aleksa Sarai [this message]
[not found] ` <1440335432-4202-2-git-send-email-cyphar-gVpy/LI/lHzQT0dZR+AlfA@public.gmane.org>
2015-08-24 18:45 ` [PATCH 1/2] cgroup: get a ref to source csses when migrating Tejun Heo
[not found] ` <20150824184507.GB28944-qYNAdHglDFBN0TnZuCh8vA@public.gmane.org>
2015-08-25 2:00 ` Aleksa Sarai
2015-08-25 18:14 ` Tejun Heo
2015-08-23 13:10 ` [PATCH 2/2] cgroup: pids: fix invalid get/put usage Aleksa Sarai
2015-08-24 19:00 ` Tejun Heo
2015-08-23 13:13 ` [PATCH 0/2] cgroup: pids: fix invalid reference semantics Aleksa Sarai
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=1440335432-4202-2-git-send-email-cyphar@cyphar.com \
--to=cyphar-gvpy/li/lhzqt0dzr+alfa@public.gmane.org \
--cc=cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox