summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2016-01-14 12:11:58 +1100
committerJames Morris <james.l.morris@oracle.com>2016-01-14 12:11:58 +1100
commitacb2cfdb316ddc3fac8183c0f71edd1680713b10 (patch)
treece94b3236d6b60dc67334ad30e938b8fd8ad80de
parent607259e17b37017e9ec0249a8b0a7d8b76b572aa (diff)
parentb197367ed1ba81b0d26f7e7f76f61731ac6e5842 (diff)
downloadlinux-acb2cfdb316ddc3fac8183c0f71edd1680713b10.tar.bz2
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next
-rw-r--r--security/selinux/hooks.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 40e071af7783..f8110cfd80ff 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -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));
}