From ec5291c69131facfdff16ca546df34faa2d3fe0a Mon Sep 17 00:00:00 2001
From: Aristeu Rozanski <aris@redhat.com>
Date: Thu, 4 Oct 2012 17:15:15 -0700
Subject: [PATCH] --- yaml --- r: 330147 b: refs/heads/master c:
 868539a3b671e0f736ddd11b67bf1dc3d8a5a921 h: refs/heads/master i:   330145:
 135125fb1f4104b7d8ec6303f6c81bea7fc532ab   330143:
 9a8611889a4618fec6bcc0fcdce8afcff5664492 v: v3

---
 [refs]                         |  2 +-
 trunk/security/device_cgroup.c | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 84d291ae4bba..565cd006243d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66b8ef67756b3051bf42a077a82c3c5c279caa5b
+refs/heads/master: 868539a3b671e0f736ddd11b67bf1dc3d8a5a921
diff --git a/trunk/security/device_cgroup.c b/trunk/security/device_cgroup.c
index e3ce02a00ffc..5b36b62e9ff4 100644
--- a/trunk/security/device_cgroup.c
+++ b/trunk/security/device_cgroup.c
@@ -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.
  */
@@ -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);
 }