Skip to content

Commit

Permalink
Merge branch 'stable-4.5' of git://git.infradead.org/users/pcmoore/se…
Browse files Browse the repository at this point in the history
…linux into for-linus
  • Loading branch information
James Morris committed Feb 26, 2016
2 parents 5bb9871 + e817c2f commit 34d47a7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion security/selinux/hooks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 34d47a7

Please sign in to comment.