Commit 296fddf7 authored by Eric Paris's avatar Eric Paris Committed by Linus Torvalds

[PATCH] SELinux: eliminate inode_security_set_security

inode_security_set_sid is only called by security_inode_init_security, which
is called when a new file is being created and needs to have its incore
security state initialized and its security xattr set.  This helper used to be
called in other places in the past, but now only has the one.  So this patch
rolls inode_security_set_sid directly back into security_inode_init_security.
There also is no need to hold the isec->sem while doing this, as the inode is
not available to other threads at this point in time.
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Acked-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Acked-by: default avatarJames Morris <jmorris@namei.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f3f87714
...@@ -1364,25 +1364,6 @@ static inline u32 file_to_av(struct file *file) ...@@ -1364,25 +1364,6 @@ static inline u32 file_to_av(struct file *file)
return av; return av;
} }
/* Set an inode's SID to a specified value. */
static int inode_security_set_sid(struct inode *inode, u32 sid)
{
struct inode_security_struct *isec = inode->i_security;
struct superblock_security_struct *sbsec = inode->i_sb->s_security;
if (!sbsec->initialized) {
/* Defer initialization to selinux_complete_init. */
return 0;
}
down(&isec->sem);
isec->sclass = inode_mode_to_security_class(inode->i_mode);
isec->sid = sid;
isec->initialized = 1;
up(&isec->sem);
return 0;
}
/* Hook functions begin here. */ /* Hook functions begin here. */
static int selinux_ptrace(struct task_struct *parent, struct task_struct *child) static int selinux_ptrace(struct task_struct *parent, struct task_struct *child)
...@@ -2091,7 +2072,13 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, ...@@ -2091,7 +2072,13 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir,
} }
} }
inode_security_set_sid(inode, newsid); /* Possibly defer initialization to selinux_complete_init. */
if (sbsec->initialized) {
struct inode_security_struct *isec = inode->i_security;
isec->sclass = inode_mode_to_security_class(inode->i_mode);
isec->sid = newsid;
isec->initialized = 1;
}
if (!ss_initialized || sbsec->behavior == SECURITY_FS_USE_MNTPOINT) if (!ss_initialized || sbsec->behavior == SECURITY_FS_USE_MNTPOINT)
return -EOPNOTSUPP; return -EOPNOTSUPP;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment