Skip to content

Commit

Permalink
device_cgroup: introduce dev_whitelist_clean()
Browse files Browse the repository at this point in the history
This function cleans all the items in a whitelist and will be used by the next
patches.

Signed-off-by: Aristeu Rozanski <aris@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Li Zefan <lizefan@huawei.com>
Cc: James Morris <jmorris@namei.org>
Cc: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Aristeu Rozanski authored and Linus Torvalds committed Oct 5, 2012
1 parent 66b8ef6 commit 868539a
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions security/device_cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,22 @@ static void dev_whitelist_rm(struct dev_cgroup *dev_cgroup,
}
}

/**
* dev_whitelist_clean - frees all entries of the whitelist
* @dev_cgroup: dev_cgroup with the whitelist to be cleaned
*
* called under devcgroup_mutex
*/
static void dev_whitelist_clean(struct dev_cgroup *dev_cgroup)
{
struct dev_whitelist_item *wh, *tmp;

list_for_each_entry_safe(wh, tmp, &dev_cgroup->whitelist, list) {
list_del(&wh->list);
kfree(wh);
}
}

/*
* called from kernel/cgroup.c with cgroup_lock() held.
*/
Expand Down Expand Up @@ -200,13 +216,9 @@ static struct cgroup_subsys_state *devcgroup_create(struct cgroup *cgroup)
static void devcgroup_destroy(struct cgroup *cgroup)
{
struct dev_cgroup *dev_cgroup;
struct dev_whitelist_item *wh, *tmp;

dev_cgroup = cgroup_to_devcgroup(cgroup);
list_for_each_entry_safe(wh, tmp, &dev_cgroup->whitelist, list) {
list_del(&wh->list);
kfree(wh);
}
dev_whitelist_clean(dev_cgroup);
kfree(dev_cgroup);
}

Expand Down

0 comments on commit 868539a

Please sign in to comment.