Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / security / device_cgroup.c

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 1be68269e1c2a2c55e2db2cc46d206539c5f79f3..4450fbeec411beed1ac7870b8820fdb850b736bf 100644 (file)
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -125,14 +125,6 @@ static int dev_whitelist_add(struct dev_cgroup *dev_cgroup,
        return 0;
 }
 
-static void whitelist_item_free(struct rcu_head *rcu)
-{
-       struct dev_whitelist_item *item;
-
-       item = container_of(rcu, struct dev_whitelist_item, rcu);
-       kfree(item);
-}
-
 /*
  * called under devcgroup_mutex
  */
@@ -155,7 +147,7 @@ remove:
                walk->access &= ~wh->access;
                if (!walk->access) {
                        list_del_rcu(&walk->list);
-                       call_rcu(&walk->rcu, whitelist_item_free);
+                       kfree_rcu(walk, rcu);
                }
        }
 }