diff options
Diffstat (limited to 'security/selinux/selinuxfs.c')
| -rw-r--r-- | security/selinux/selinuxfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 3ad290251288..298e695d6822 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
| @@ -1297,7 +1297,7 @@ out: | |||
| 1297 | 1297 | ||
| 1298 | #define NULL_FILE_NAME "null" | 1298 | #define NULL_FILE_NAME "null" |
| 1299 | 1299 | ||
| 1300 | struct dentry *selinux_null; | 1300 | struct path selinux_null; |
| 1301 | 1301 | ||
| 1302 | static ssize_t sel_read_avc_cache_threshold(struct file *filp, char __user *buf, | 1302 | static ssize_t sel_read_avc_cache_threshold(struct file *filp, char __user *buf, |
| 1303 | size_t count, loff_t *ppos) | 1303 | size_t count, loff_t *ppos) |
| @@ -1838,7 +1838,7 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent) | |||
| 1838 | 1838 | ||
| 1839 | init_special_inode(inode, S_IFCHR | S_IRUGO | S_IWUGO, MKDEV(MEM_MAJOR, 3)); | 1839 | init_special_inode(inode, S_IFCHR | S_IRUGO | S_IWUGO, MKDEV(MEM_MAJOR, 3)); |
| 1840 | d_add(dentry, inode); | 1840 | d_add(dentry, inode); |
| 1841 | selinux_null = dentry; | 1841 | selinux_null.dentry = dentry; |
| 1842 | 1842 | ||
| 1843 | dentry = sel_make_dir(sb->s_root, "avc", &sel_last_ino); | 1843 | dentry = sel_make_dir(sb->s_root, "avc", &sel_last_ino); |
| 1844 | if (IS_ERR(dentry)) { | 1844 | if (IS_ERR(dentry)) { |
| @@ -1912,7 +1912,7 @@ static int __init init_sel_fs(void) | |||
| 1912 | return err; | 1912 | return err; |
| 1913 | } | 1913 | } |
| 1914 | 1914 | ||
| 1915 | selinuxfs_mount = kern_mount(&sel_fs_type); | 1915 | selinux_null.mnt = selinuxfs_mount = kern_mount(&sel_fs_type); |
| 1916 | if (IS_ERR(selinuxfs_mount)) { | 1916 | if (IS_ERR(selinuxfs_mount)) { |
| 1917 | printk(KERN_ERR "selinuxfs: could not mount!\n"); | 1917 | printk(KERN_ERR "selinuxfs: could not mount!\n"); |
| 1918 | err = PTR_ERR(selinuxfs_mount); | 1918 | err = PTR_ERR(selinuxfs_mount); |
