diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-10-16 21:04:18 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-10-16 21:04:18 +1100 |
| commit | 9b32011acdc4428474b7cba865f713a11b9b9bd3 (patch) | |
| tree | d781cae7fd53a4f19d0d64503ae605dd01855613 /security | |
| parent | 0429fbc0bdc297d64188483ba029a23773ae07b0 (diff) | |
| parent | 923190d32de4428afbea5e5773be86bea60a9925 (diff) | |
| download | linux-9b32011acdc4428474b7cba865f713a11b9b9bd3.tar.gz linux-9b32011acdc4428474b7cba865f713a11b9b9bd3.tar.bz2 linux-9b32011acdc4428474b7cba865f713a11b9b9bd3.zip | |
Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into for-linus2
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 8426a2aa8dce..e66314138b38 100644 --- 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); |