Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/s…

…elinux into for-linus2
adn770 · Oct 16, 2014 · 9b32011 · 9b32011
2 parents 0429fbc + 923190d
commit 9b32011
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
@@ -481,6 +481,7 @@ static int sb_finish_set_opts(struct super_block *sb)
 				list_entry(sbsec->isec_head.next,
 					   struct inode_security_struct, list);
 		struct inode *inode = isec->inode;
+		list_del_init(&isec->list);
 		spin_unlock(&sbsec->isec_lock);
 		inode = igrab(inode);
 		if (inode) {
@@ -489,7 +490,6 @@ static int sb_finish_set_opts(struct super_block *sb)
 			iput(inode);
 		}
 		spin_lock(&sbsec->isec_lock);
-		list_del_init(&isec->list);
 		goto next_inode;
 	}
 	spin_unlock(&sbsec->isec_lock);