提交 c957f6df 编写于 作者: V Vivek Goyal 提交者: Paul Moore

selinux: Pass security pointer to determine_inode_label()

Right now selinux_determine_inode_label() works on security pointer of
current task. Soon I need this to work on a security pointer retrieved
from a set of creds. So start passing in a pointer and caller can
decide where to fetch security pointer from.
Signed-off-by: NVivek Goyal <vgoyal@redhat.com>
Acked-by: NStephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: NPaul Moore <paul@paul-moore.com>
上级 19472b69
...@@ -1808,13 +1808,13 @@ static int file_has_perm(const struct cred *cred, ...@@ -1808,13 +1808,13 @@ static int file_has_perm(const struct cred *cred,
/* /*
* Determine the label for an inode that might be unioned. * Determine the label for an inode that might be unioned.
*/ */
static int selinux_determine_inode_label(struct inode *dir, static int
const struct qstr *name, selinux_determine_inode_label(const struct task_security_struct *tsec,
u16 tclass, struct inode *dir,
u32 *_new_isid) const struct qstr *name, u16 tclass,
u32 *_new_isid)
{ {
const struct superblock_security_struct *sbsec = dir->i_sb->s_security; const struct superblock_security_struct *sbsec = dir->i_sb->s_security;
const struct task_security_struct *tsec = current_security();
if ((sbsec->flags & SE_SBINITIALIZED) && if ((sbsec->flags & SE_SBINITIALIZED) &&
(sbsec->behavior == SECURITY_FS_USE_MNTPOINT)) { (sbsec->behavior == SECURITY_FS_USE_MNTPOINT)) {
...@@ -1857,8 +1857,8 @@ static int may_create(struct inode *dir, ...@@ -1857,8 +1857,8 @@ static int may_create(struct inode *dir,
if (rc) if (rc)
return rc; return rc;
rc = selinux_determine_inode_label(dir, &dentry->d_name, tclass, rc = selinux_determine_inode_label(current_security(), dir,
&newsid); &dentry->d_name, tclass, &newsid);
if (rc) if (rc)
return rc; return rc;
...@@ -2838,7 +2838,8 @@ static int selinux_dentry_init_security(struct dentry *dentry, int mode, ...@@ -2838,7 +2838,8 @@ static int selinux_dentry_init_security(struct dentry *dentry, int mode,
u32 newsid; u32 newsid;
int rc; int rc;
rc = selinux_determine_inode_label(d_inode(dentry->d_parent), name, rc = selinux_determine_inode_label(current_security(),
d_inode(dentry->d_parent), name,
inode_mode_to_security_class(mode), inode_mode_to_security_class(mode),
&newsid); &newsid);
if (rc) if (rc)
...@@ -2863,7 +2864,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, ...@@ -2863,7 +2864,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir,
sid = tsec->sid; sid = tsec->sid;
newsid = tsec->create_sid; newsid = tsec->create_sid;
rc = selinux_determine_inode_label( rc = selinux_determine_inode_label(current_security(),
dir, qstr, dir, qstr,
inode_mode_to_security_class(inode->i_mode), inode_mode_to_security_class(inode->i_mode),
&newsid); &newsid);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册