Bluetooth: Verify that l2cap_get_conf_opt provides large enough buffer

[pandora-kernel.git] / security / device_cgroup.c

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 92e24bb..bc94175 100644 (file)
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -7,6 +7,7 @@
 #include <linux/device_cgroup.h>
 #include <linux/cgroup.h>
 #include <linux/ctype.h>
+#include <linux/export.h>
 #include <linux/list.h>
 #include <linux/uaccess.h>
 #include <linux/seq_file.h>
@@ -202,8 +203,8 @@ static void devcgroup_destroy(struct cgroup_subsys *ss,
 
        dev_cgroup = cgroup_to_devcgroup(cgroup);
        list_for_each_entry_safe(wh, tmp, &dev_cgroup->whitelist, list) {
-               list_del_rcu(&wh->list);
-               kfree_rcu(wh, rcu);
+               list_del(&wh->list);
+               kfree(wh);
        }
        kfree(dev_cgroup);
 }
@@ -278,7 +279,7 @@ static int may_access_whitelist(struct dev_cgroup *c,
 {
        struct dev_whitelist_item *whitem;
 
-       list_for_each_entry_rcu(whitem, &c->whitelist, list) {
+       list_for_each_entry(whitem, &c->whitelist, list) {
                if (whitem->type & DEV_ALL)
                        return 1;
                if ((refwh->type & DEV_BLOCK) && !(whitem->type & DEV_BLOCK))
@@ -500,6 +501,7 @@ found:
 
        return -EPERM;
 }
+EXPORT_SYMBOL(__devcgroup_inode_permission);
 
 int devcgroup_inode_mknod(int mode, dev_t dev)
 {