[PATCH v2 2/6] device_cgroup: introduce dev_whitelist_clean()
From: Aristeu Rozanski <hidden>
Date: 2012-09-04 14:34:39
Also in:
lkml
This function cleans all the items in a whitelist and will be used by the next patches. v2: - no changes Cc: Tejun Heo <tj@kernel.org> Cc: Li Zefan <redacted> Cc: James Morris <jmorris@namei.org> Cc: Pavel Emelyanov <redacted> Cc: Serge Hallyn <redacted> Signed-off-by: Aristeu Rozanski <redacted> --- security/device_cgroup.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) Index: github/security/device_cgroup.c ===================================================================
--- github.orig/security/device_cgroup.c 2012-08-21 10:50:34.650810797 -0400
+++ github/security/device_cgroup.c 2012-08-21 10:50:37.526892088 -0400@@ -157,6 +157,22 @@ } } +/** + * 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. */
@@ -203,13 +219,9 @@ 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); }