diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-02-26 19:32:16 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-02-26 19:32:16 +1100 |
| commit | 34d47a77591f2fe7988beeca86d8ee281aee827f (patch) | |
| tree | 5c70bf96dee1b001f018be2b831ca482f0e86f00 /security | |
| parent | 5bb9871eb8daa2e6a07caf7aeafbe2d0b3faad8f (diff) | |
| parent | e817c2f33efb4aa7f02c98dfab9a5f8ff383ea7e (diff) | |
| download | linux-34d47a77591f2fe7988beeca86d8ee281aee827f.tar.gz linux-34d47a77591f2fe7988beeca86d8ee281aee827f.tar.bz2 linux-34d47a77591f2fe7988beeca86d8ee281aee827f.zip | |
Merge branch 'stable-4.5' of git://git.infradead.org/users/pcmoore/selinux into for-linus
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index f8110cfd80ff..f1ab71504e1d 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -3249,7 +3249,7 @@ static int selinux_inode_listsecurity(struct inode *inode, char *buffer, size_t static void selinux_inode_getsecid(struct inode *inode, u32 *secid) { - struct inode_security_struct *isec = inode_security(inode); + struct inode_security_struct *isec = inode_security_novalidate(inode); *secid = isec->sid; } |