Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull selinux fix from James Morris: "Fix for a list corruption bug in the SELinux code" * 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: selinux: fix inode security list corruption
This commit is contained in:
commit
e56d9fccb1
|
@ -481,6 +481,7 @@ next_inode:
|
||||||
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 @@ next_inode:
|
||||||
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);
|
||||||
|
|
Loading…
Reference in New Issue