summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2012-12-07 01:41:33 +0000
committerBen Hutchings <ben@decadent.org.uk>2013-01-03 03:26:03 +0000
commitb17d8aeb433dcf5f2ff6d3ea5e1cc04375cea00f (patch)
tree3a6de0c9bfb48aec82f42218796c986f6a412c60 /security
parent20c7bbdde3de202d847f7e9f14cbd7ffeb03e81e (diff)
Revert "device_cgroup: fix RCU usage"
This reverts commit c5ee58688baa98bc3a4f6095a1acf6fd7fd9e967, which was commit 201e72acb2d3821e2de9ce6091e98859c316b29a upstream. Herton Ronaldo Krzesinski pointed out that the race condition this dealt with does not exist in 3.2.y. Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'security')
-rw-r--r--security/device_cgroup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 92e24bb6443e..4450fbeec411 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -202,8 +202,8 @@ static void devcgroup_destroy(struct cgroup_subsys *ss,
dev_cgroup = cgroup_to_devcgroup(cgroup);
list_for_each_entry_safe(wh, tmp, &dev_cgroup->whitelist, list) {
- list_del_rcu(&wh->list);
- kfree_rcu(wh, rcu);
+ list_del(&wh->list);
+ kfree(wh);
}
kfree(dev_cgroup);
}
@@ -278,7 +278,7 @@ static int may_access_whitelist(struct dev_cgroup *c,
{
struct dev_whitelist_item *whitem;
- list_for_each_entry_rcu(whitem, &c->whitelist, list) {
+ list_for_each_entry(whitem, &c->whitelist, list) {
if (whitem->type & DEV_ALL)
return 1;
if ((refwh->type & DEV_BLOCK) && !(whitem->type & DEV_BLOCK))