Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-24 08:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] SELinux: fix hard link count for selinuxfs root directory

Browse Source 
A further fix is needed for selinuxfs link count management, to ensure that
the count is correct for the parent directory when a subdirectory is
created.  This is only required for the root directory currently, but the
code has been updated for the general case.

Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
James Morris 2006-03-22 00:09:20 -08:00 committed by Linus Torvalds
parent d6aafa6535
commit edb20fb5be
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
security/selinux/selinuxfs.c
View File

@ -1166,12 +1166,12 @@ out:
return ret; return ret;
} }
static int sel_make_dir(struct super_block *sb, struct dentry *dentry) static int sel_make_dir(struct inode *dir, struct dentry *dentry)
{ {
int ret = 0; int ret = 0;
struct inode *inode; struct inode *inode;
inode = sel_make_inode(sb, S_IFDIR | S_IRUGO | S_IXUGO); inode = sel_make_inode(dir->i_sb, S_IFDIR | S_IRUGO | S_IXUGO);
if (!inode) { if (!inode) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
@ -1181,6 +1181,8 @@ static int sel_make_dir(struct super_block *sb, struct dentry *dentry)
/* directory inodes start off with i_nlink == 2 (for "." entry) */ /* directory inodes start off with i_nlink == 2 (for "." entry) */
inode->i_nlink++; inode->i_nlink++;
d_add(dentry, inode); d_add(dentry, inode);
/* bump link count on parent directory, too */
dir->i_nlink++;
out: out:
return ret; return ret;
} }
@ -1189,7 +1191,7 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
{ {
int ret; int ret;
struct dentry *dentry; struct dentry *dentry;
struct inode *inode; struct inode *inode, *root_inode;
struct inode_security_struct *isec; struct inode_security_struct *isec;
static struct tree_descr selinux_files[] = { static struct tree_descr selinux_files[] = {
@ -1212,13 +1214,15 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
if (ret) if (ret)
goto err; goto err;
root_inode = sb->s_root->d_inode;
dentry = d_alloc_name(sb->s_root, BOOL_DIR_NAME); dentry = d_alloc_name(sb->s_root, BOOL_DIR_NAME);
if (!dentry) { if (!dentry) {
ret = -ENOMEM; ret = -ENOMEM;
goto err; goto err;
} }
ret = sel_make_dir(sb, dentry); ret = sel_make_dir(root_inode, dentry);
if (ret) if (ret)
goto err; goto err;
@ -1250,7 +1254,7 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
goto err; goto err;
} }
ret = sel_make_dir(sb, dentry); ret = sel_make_dir(root_inode, dentry);
if (ret) if (ret)
goto err; goto err;