From eb8bdd197f74c95d40bb26bae45122070d0e4903 Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Tue, 2 Sep 2008 14:35:52 -0700 Subject: [PATCH] --- yaml --- r: 109413 b: refs/heads/master c: 36fd71d293898a59b14e49da1f6e81c1a58f2035 h: refs/heads/master i: 109411: 4eeff966838646f87fbb725da5efe9241209715a v: v3 --- [refs] | 2 +- trunk/security/device_cgroup.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 213e4de3c5c2..9737e5c7b073 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09a2910e54646f7a334702fbafa7a6129dc072e6 +refs/heads/master: 36fd71d293898a59b14e49da1f6e81c1a58f2035 diff --git a/trunk/security/device_cgroup.c b/trunk/security/device_cgroup.c index 7bd296cca041..46f23971f7e4 100644 --- a/trunk/security/device_cgroup.c +++ b/trunk/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 @@ int devcgroup_inode_permission(struct inode *inode, int mask) 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 @@ int devcgroup_inode_mknod(int mode, dev_t dev) rcu_read_unlock(); return 0; } + rcu_read_unlock(); + return -EPERM; }