From: "Serge E. Hallyn" <serue@us.ibm.com>
To: Li Zefan <lizf@cn.fujitsu.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Paul Menage <menage@google.com>,
LKML <linux-kernel@vger.kernel.org>,
Linux Containers <containers@lists.linux-foundation.org>
Subject: Re: [PATCH] devcgroup: fix race against rmdir()
Date: Mon, 25 Aug 2008 11:43:04 -0500 [thread overview]
Message-ID: <20080825164304.GA13583@us.ibm.com> (raw)
In-Reply-To: <48B2174E.9060608@cn.fujitsu.com>
Quoting Li Zefan (lizf@cn.fujitsu.com):
> During the use of a dev_cgroup, we should guarantee the corresponding
> cgroup won't be deleted (i.e. via rmdir). This can be done through
> css_get(&dev_cgroup->css), but here we can just get and use the
> dev_cgroup under rcu_read_lock.
>
> And also remove checking NULL dev_cgroup, it won't be NULL since a task
> always belongs to a cgroup.
>
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Looks good. Thanks, Li.
Acked-by: Serge Hallyn <serue@us.ibm.com>
> ---
> security/device_cgroup.c | 18 +++++++++---------
> 1 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/security/device_cgroup.c b/security/device_cgroup.c
> index 7bd296c..46f2397 100644
> --- a/security/device_cgroup.c
> +++ b/security/device_cgroup.c
> @@ -508,12 +508,11 @@ int devcgroup_inode_permission(struct inode *inode, int mask)
> return 0;
> if (!S_ISBLK(inode->i_mode) && !S_ISCHR(inode->i_mode))
> return 0;
> - dev_cgroup = css_to_devcgroup(task_subsys_state(current,
> - devices_subsys_id));
> - if (!dev_cgroup)
> - return 0;
>
> rcu_read_lock();
> +
> + dev_cgroup = task_devcgroup(current);
> +
> list_for_each_entry_rcu(wh, &dev_cgroup->whitelist, list) {
> if (wh->type & DEV_ALL)
> goto acc_check;
> @@ -533,6 +532,7 @@ acc_check:
> rcu_read_unlock();
> return 0;
> }
> +
> rcu_read_unlock();
>
> return -EPERM;
> @@ -543,12 +543,10 @@ int devcgroup_inode_mknod(int mode, dev_t dev)
> struct dev_cgroup *dev_cgroup;
> struct dev_whitelist_item *wh;
>
> - dev_cgroup = css_to_devcgroup(task_subsys_state(current,
> - devices_subsys_id));
> - if (!dev_cgroup)
> - return 0;
> -
> rcu_read_lock();
> +
> + dev_cgroup = task_devcgroup(current);
> +
> list_for_each_entry(wh, &dev_cgroup->whitelist, list) {
> if (wh->type & DEV_ALL)
> goto acc_check;
> @@ -566,6 +564,8 @@ acc_check:
> rcu_read_unlock();
> return 0;
> }
> +
> rcu_read_unlock();
> +
> return -EPERM;
> }
> --
> 1.5.4.rc3
prev parent reply other threads:[~2008-08-25 16:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-25 2:22 [PATCH] devcgroup: fix race against rmdir() Li Zefan
2008-08-25 16:43 ` Serge E. Hallyn [this message]
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=20080825164304.GA13583@us.ibm.com \
--to=serue@us.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=containers@lists.linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=menage@google.com \
/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