luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next

Browse Source
This commit is contained in:
James Morris 2016-01-14 12:11:58 +11:00
commit acb2cfdb31
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/selinux/hooks.c
View File

@ -273,11 +273,6 @@ static int __inode_security_revalidate(struct inode *inode,
return 0;
}
static void inode_security_revalidate(struct inode *inode)
{
__inode_security_revalidate(inode, NULL, true);
}
static struct inode_security_struct *inode_security_novalidate(struct inode *inode)
{
return inode->i_security;
@ -3277,19 +3272,19 @@ static int selinux_file_permission(struct file *file, int mask)
{
struct inode *inode = file_inode(file);
struct file_security_struct *fsec = file->f_security;
struct inode_security_struct *isec = inode_security(inode);
struct inode_security_struct *isec;
u32 sid = current_sid();
if (!mask)
/* No permission to check. Existence test. */
return 0;
isec = inode_security(inode);
if (sid == fsec->sid && fsec->isid == isec->sid &&
fsec->pseqno == avc_policy_seqno())
/* No change since file_open check. */
return 0;
inode_security_revalidate(inode);
return selinux_revalidate_file_permission(file, mask);
}
@ -3595,7 +3590,6 @@ static int selinux_file_open(struct file *file, const struct cred *cred)
* new inode label or new policy.
* This check is not redundant - do not remove.
*/
inode_security_revalidate(file_inode(file));
return file_path_has_perm(cred, file, open_file_to_av(file));
}