1 files changed, 17 insertions, 5 deletions

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index e3ce02a00ffc..5b36b62e9ff4 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -154,6 +154,22 @@ remove:
         }
 }
 
+/**
+ * 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.
  */
@@ -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);
 }