Merge branch 'stable-4.5' of git://git.infradead.org/users/pcmoore/selinux into for-linus

34d47a77 · James Morris <[email protected]> · 2016-02-26 19:32:16 +11:00

Merge commit. Changes below are compared with the first parent: 5bb9871e.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
security/selinux/hooks.c	modified	+1	−1	View file

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index f8110cf..f1ab715 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;
 }
 