1 files changed, 9 insertions, 0 deletions

diff --git a/fs/namei.c b/fs/namei.c
index e179f71bfcb0..32fd9655485b 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -30,6 +30,7 @@
 #include <linux/capability.h>
 #include <linux/file.h>
 #include <linux/fcntl.h>
+#include <linux/device_cgroup.h>
 #include <asm/namei.h>
 #include <asm/uaccess.h>
 
@@ -281,6 +282,10 @@ int permission(struct inode *inode, int mask, struct nameidata *nd)
         if (retval)
                 return retval;
 
+        retval = devcgroup_inode_permission(inode, mask);
+        if (retval)
+                return retval;
+
         return security_inode_permission(inode, mask, nd);
 }
 
@@ -2028,6 +2033,10 @@ int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
         if (!dir->i_op || !dir->i_op->mknod)
                 return -EPERM;
 
+        error = devcgroup_inode_mknod(mode, dev);
+        if (error)
+                return error;
+
         error = security_inode_mknod(dir, dentry, mode, dev);
         if (error)
                 return error;