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

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 8426a2aa8dce37abaa4d0cad8d20cb56113ce453..e66314138b3822036968abb52b672dcfc02c73ee 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -481,6 +481,7 @@ next_inode:
                                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 @@ next_inode:
                        iput(inode);
                }
                spin_lock(&sbsec->isec_lock);
-               list_del_init(&isec->list);
                goto next_inode;
        }
        spin_unlock(&sbsec->isec_lock);