p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
James Morris 2014-10-16 21:04:18 +11:00
parent 0429fbc0bd 923190d32d
commit 9b32011acd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/selinux/hooks.c
View File

@ -481,6 +481,7 @@ static int sb_finish_set_opts(struct super_block *sb)
list_entry(sbsec->isec_head.next, list_entry(sbsec->isec_head.next,
struct inode_security_struct, list); struct inode_security_struct, list);
struct inode *inode = isec->inode; struct inode *inode = isec->inode;
list_del_init(&isec->list);
spin_unlock(&sbsec->isec_lock); spin_unlock(&sbsec->isec_lock);
inode = igrab(inode); inode = igrab(inode);
if (inode) { if (inode) {
@ -489,7 +490,6 @@ static int sb_finish_set_opts(struct super_block *sb)
iput(inode); iput(inode);
} }
spin_lock(&sbsec->isec_lock); spin_lock(&sbsec->isec_lock);
list_del_init(&isec->list);
goto next_inode; goto next_inode;
} }
spin_unlock(&sbsec->isec_lock); spin_unlock(&sbsec->isec_lock);